clean up MSA/SPD files.

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

5 files changed, 13 insertions, 64 deletions

diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
index 87f2c606f9..dc3e7c1499 100644
--- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
+++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

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

   <MsaHeader>

     <ModuleName>WinNtAutoScan</ModuleName>

     <ModuleType>PEIM</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for WinNtAutoScan module</Abstract>

     <Description>This module abstracts memory auto-scan in a Windows NT environment.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

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

     <License>All rights reserved. This program and the accompanying materials

       are licensed and made available under the terms and conditions of the BSD License

       which accompanies this distribution.  The full text of the license may be found at

@@ -29,20 +29,8 @@
       <Keyword>PeimEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>HobLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesTablePointerLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>WinntAutoscan.c</Filename>

@@ -60,9 +48,6 @@
     <Ppi Usage="ALWAYS_CONSUMED">

       <PpiCName>gPeiBaseMemoryTestPpiGuid</PpiCName>

     </Ppi>

-    <Ppi Usage="ALWAYS_PRODUCED">

-      <PpiCName>gEfiPeiMemoryDiscoveredPpiGuid</PpiCName>

-    </Ppi>

   </PPIs>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.msa b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
index b812ab9a87..e8225a8a85 100644
--- a/EdkNt32Pkg/Pei/BootMode/BootMode.msa
+++ b/EdkNt32Pkg/Pei/BootMode/BootMode.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

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

   <MsaHeader>

     <ModuleName>BootMode</ModuleName>

     <ModuleType>PEIM</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for BootMode module</Abstract>

     <Description>This module provides platform specific function to detect boot mode.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

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

     <License>All rights reserved. This program and the accompanying materials

       are licensed and made available under the terms and conditions of the BSD License

       which accompanies this distribution.  The full text of the license may be found at

@@ -28,15 +28,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PeimEntryPoint</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesTablePointerLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>BootMode.c</Filename>

@@ -44,8 +35,6 @@
   </SourceFiles>

   <PackageDependencies>

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

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

-    <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

   </PackageDependencies>

   <PPIs>

     <Ppi Usage="SOMETIMES_PRODUCED">

diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
index c4434bbdac..9d600f2f1c 100644
--- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
+++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

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

   <MsaHeader>

     <ModuleName>WinNtFwh</ModuleName>

     <ModuleType>PEIM</ModuleType>

@@ -8,7 +8,7 @@
     <Abstract>Component description file for WinNtFwh module</Abstract>

     <Description>This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices

     on the NT32 emulator.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

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

     <License>All rights reserved. This program and the accompanying materials

       are licensed and made available under the terms and conditions of the BSD License

       which accompanies this distribution.  The full text of the license may be found at

@@ -32,12 +32,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>HobLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesTablePointerLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>WinntFwh.c</Filename>

@@ -45,7 +39,6 @@
   </SourceFiles>

   <PackageDependencies>

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

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

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

   </PackageDependencies>

   <PPIs>

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index bedabe810b..5a0503e5cc 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

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

   <MsaHeader>

     <ModuleName>PeiFlashMap</ModuleName>

     <ModuleType>PEIM</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for FlashMap PEI module</Abstract>

     <Description>This module installs FlashMap PPI which is used to get flash layout information.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

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

     <License>All rights reserved. This program and the accompanying materials

       are licensed and made available under the terms and conditions of the BSD License

       which accompanies this distribution.  The full text of the license may be found at

@@ -35,9 +35,6 @@
       <Keyword>PeiServicesLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesTablePointerLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -73,9 +70,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>

     </GuidCNames>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiSystemNvDataHobGuid</GuidCName>

-    </GuidCNames>

   </Guids>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

@@ -92,15 +86,12 @@
         This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM

         will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC

         type, as FD is mapped to process space by WinNT OS. On real platform, it is 

-        normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.

-      </HelpText>

+        normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS.</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdFlashNvStorageVariableSize</C_Name>

       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>

-        To get the NvStorage Variable size from this PCD.

-      </HelpText>

+      <HelpText>To get the NvStorage Variable size from this PCD.</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">

       <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>

diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
index 92a65ef314..d0b5bb2e12 100644
--- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
+++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

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

   <MsaHeader>

     <ModuleName>WinNtStuff</ModuleName>

     <ModuleType>PEIM</ModuleType>

     <GuidValue>D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755</GuidValue>

     <Version>1.0</Version>

     <Abstract>Stuff driver</Abstract>

-    <Description>

-      Tiano PEIM to abstract construction of firmware volume in a Windows NT environment.

-    </Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Description>Tiano PEIM to abstract construction of firmware volume in a Windows NT environment.</Description>

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

     <License>All rights reserved. This program and the accompanying materials

       are licensed and made available under the terms and conditions of the BSD License

       which accompanies this distribution.  The full text of the license may be found at

@@ -33,12 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>HobLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeiServicesTablePointerLib</Keyword>

-    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>winntstuff.c</Filename>

@@ -46,7 +38,6 @@
   </SourceFiles>

   <PackageDependencies>

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

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

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

   </PackageDependencies>

   <Protocols>