X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FPei%2FFlashMap%2FFlashMap.msa;h=3bf00a08bca013a5de5481f2355ebf9738db775b;hp=1a098cf057feca35b71730d0aa16d4c975ce8eab;hb=d57e875ca3aac3249751b18db03921b6f0cff5fe;hpb=202c5d55e5a5a1f065038cda8316ad36293aa6bb

diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index 1a098cf057..3bf00a08bc 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -1,13 +1,5 @@
 <?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">
+<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>
@@ -15,7 +7,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <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
@@ -42,9 +34,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>PeiServicesLib</Keyword>
     </LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">
-      <Keyword>PeiServicesTablePointerLib</Keyword>
-    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>BaseMemoryLib</Keyword>
     </LibraryClass>
@@ -58,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>
   </PackageDependencies>
   <Protocols>
@@ -66,6 +55,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>
     </Protocol>
   </Protocols>
+  <Hobs>
+    <HobTypes HobGuidCName="gEfiFlashMapHobGuid" Usage="ALWAYS_CONSUMED">
+      <HobType>GUID_EXTENSION</HobType>
+    </HobTypes>
+  </Hobs>
   <PPIs>
     <Ppi Usage="ALWAYS_PRODUCED">
       <PpiCName>gPeiFlashMapPpiGuid</PpiCName>
@@ -75,15 +69,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Ppi>
   </PPIs>
   <Guids>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>
-    </GuidCNames>
     <GuidCNames Usage="ALWAYS_CONSUMED">
       <GuidCName>gEfiFirmwareFileSystemGuid</GuidCName>
     </GuidCNames>
-    <GuidCNames Usage="ALWAYS_CONSUMED">
-      <GuidCName>gEfiSystemNvDataHobGuid</GuidCName>
-    </GuidCNames>
   </Guids>
   <Externs>
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
@@ -96,32 +84,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdFlashNvStorageVariableBase</C_Name>
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
-      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.  
+      <HelpText>The driver sets the NV Storage FV base address defined by this PCD.
         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>
+        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>
     </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
+    <PcdEntry PcdItemType="DYNAMIC">
+      <C_Name>PcdFlashNvStorageVariableSize</C_Name>
+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+      <HelpText>To get the NvStorage Variable size from this PCD.</HelpText>
+    </PcdEntry>
+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
       <C_Name>PcdFlashNvStorageFtwSpareBase</C_Name>
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
       <HelpText>To get base address of the FTW spare block section in NV firmware volume.</HelpText>
     </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
       <C_Name>PcdFlashNvStorageFtwSpareSize</C_Name>
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
       <HelpText>To get size of the FTW spare block section in NV firmware volume.</HelpText>
     </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
       <C_Name>PcdFlashNvStorageFtwWorkingBase</C_Name>
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
       <HelpText>To get base address of the FTW working block section in NV firmware volume.</HelpText>
     </PcdEntry>
-    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
+    <PcdEntry PcdItemType="DYNAMIC" Usage="ALWAYS_CONSUMED">
       <C_Name>PcdFlashNvStorageFtwWorkingSize</C_Name>
       <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
       <HelpText>To get size of the FTW working block section in NV firmware volume.</HelpText>
-    </PcdEntry>    
+    </PcdEntry>
   </PcdCoded>
 </ModuleSurfaceArea>