Update the EmuVariable and Variable modules to have a ModuleType of DXE_SAL_DRIVER for IPF builds.

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

7 files changed, 253 insertions, 58 deletions

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 0472f2d66f..3c1bd0c394 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -434,7 +434,9 @@
     <Filename>Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa</Filename>

     <Filename>Universal/Variable/Pei/Variable.msa</Filename>

     <Filename>Universal/EmuVariable/RuntimeDxe/EmuVariable.msa</Filename>

+    <Filename>Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa</Filename>

     <Filename>Universal/Variable/RuntimeDxe/Variable.msa</Filename>

+    <Filename>Universal/Variable/RuntimeDxe/VariableIpf.msa</Filename>

     <Filename>Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa</Filename>

     <Filename>Universal/WatchdogTimer/Dxe/WatchDogTimer.msa</Filename>

     <Filename>Universal/StatusCode/Pei/PeiStatusCode.msa</Filename>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index 6c7d5fe0d1..9c19e381e9 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

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

+    <SupportedArchitectures>IA32 X64 EBC</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>EmuVariable</OutputFileBasename>

   </ModuleDefinitions>

@@ -41,9 +41,6 @@
       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>EdkDxeSalLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

@@ -51,10 +48,7 @@
     <Filename>Variable.h</Filename>

     <Filename>EmuVariable.c</Filename>

     <Filename>EmuVariable.dxs</Filename>

-    <Filename SupArchList="IA32">InitVariable.c</Filename>

-    <Filename SupArchList="X64">InitVariable.c</Filename>

-    <Filename SupArchList="EBC">InitVariable.c</Filename>

-    <Filename SupArchList="IPF">Ipf/InitVariable.c</Filename>

+    <Filename>InitVariable.c</Filename>

   </SourceFiles>

   <PackageDependencies>

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

@@ -73,12 +67,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>

-    </Protocol>

   </Protocols>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
new file mode 100644
index 0000000000..61f5ccff7f
--- /dev/null
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>

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

+  <MsaHeader>

+    <ModuleName>EmuVariableIpf</ModuleName>

+    <ModuleType>DXE_SAL_DRIVER</ModuleType>

+    <GuidValue>A46320E8-0514-489a-BC4E-481624D9CE33</GuidValue>

+    <Version>1.0</Version>

+    <Abstract>Emulation Variable for EFI_RUNTIME_SERVICES.</Abstract>

+    <Description>This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName</Description>

+    <Copyright>Copyright (c) 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>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IPF</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>EmuVariableIpf</OutputFileBasename>

+  </ModuleDefinitions>

+  <LibraryClassDefinitions>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiRuntimeLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkDxeSalLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+  </LibraryClassDefinitions>

+  <SourceFiles>

+    <Filename>Variable.h</Filename>

+    <Filename>EmuVariable.c</Filename>

+    <Filename>EmuVariable.dxs</Filename>

+    <Filename>Ipf/InitVariable.c</Filename>

+  </SourceFiles>

+  <PackageDependencies>

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

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

+  </PackageDependencies>

+  <Protocols>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>

+    </Protocol>

+  </Protocols>

+  <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

+    <Extern>

+      <ModuleEntryPoint>VariableServiceInitialize</ModuleEntryPoint>

+    </Extern>

+  </Externs>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Ia32Variable.dxs b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.dxs
index 821e27df4a..821e27df4a 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Ia32Variable.dxs
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.dxs
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 65ac9e0e32..d5d83156da 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -17,7 +17,7 @@
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

   <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>

+    <SupportedArchitectures>IA32 X64</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

     <OutputFileBasename>Variable</OutputFileBasename>

   </ModuleDefinitions>

@@ -53,9 +53,6 @@
       <Keyword>EdkFvbServiceLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>EdkDxeSalLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

@@ -64,12 +61,8 @@
     <Filename>Variable.c</Filename>

     <Filename>reclaim.h</Filename>

     <Filename>reclaim.c</Filename>

-    <Filename SupArchList="IA32">InitVariable.c</Filename>

-    <Filename SupArchList="IA32">Ia32Variable.dxs</Filename>

-    <Filename SupArchList="X64">InitVariable.c</Filename>

-    <Filename SupArchList="X64">x64Variable.dxs</Filename>

-    <Filename SupArchList="IPF">Ipf/InitVariable.c</Filename>

-    <Filename SupArchList="IPF">IpfVariable.dxs</Filename>

+    <Filename>InitVariable.c</Filename>

+    <Filename>Variable.dxs</Filename>

   </SourceFiles>

   <PackageDependencies>

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

@@ -112,12 +105,6 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>

-    </Protocol>

   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
new file mode 100644
index 0000000000..42c1a94904
--- /dev/null
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>

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

+  <MsaHeader>

+    <ModuleName>VariableIpf</ModuleName>

+    <ModuleType>DXE_SAL_DRIVER</ModuleType>

+    <GuidValue>9D0E793B-3970-4a6c-BA26-B4E2C30B437B</GuidValue>

+    <Version>1.0</Version>

+    <Abstract>Component description file for Variable module.</Abstract>

+    <Description>This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.</Description>

+    <Copyright>Copyright (c) 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>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IPF</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>VariableIpf</OutputFileBasename>

+  </ModuleDefinitions>

+  <LibraryClassDefinitions>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PcdLib</Keyword>

+    </LibraryClass>  

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DxeServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiRuntimeLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>HobLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkFvbServiceLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>EdkDxeSalLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+  </LibraryClassDefinitions>

+  <SourceFiles>

+    <Filename>Variable.h</Filename>

+    <Filename>Variable.c</Filename>

+    <Filename>reclaim.h</Filename>

+    <Filename>reclaim.c</Filename>

+    <Filename>Ipf/InitVariable.c</Filename>

+    <Filename>IpfVariable.dxs</Filename>

+  </SourceFiles>

+  <PackageDependencies>

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

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

+  </PackageDependencies>

+  <Protocols>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiCpuIoProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiFvbExtensionProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiExtendedSalBootServiceProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>gEfiExtendedSalVariableServicesProtocolGuid</ProtocolCName>

+    </Protocol>

+  </Protocols>

+  <Guids>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>gEfiFlashMapHobGuid</GuidCName>

+    </GuidCNames>

+    <!--<GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>Hob</GuidCName>

+    </GuidCNames>-->

+    <!--<GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>SystemNvData</GuidCName>

+    </GuidCNames>-->

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>gEfiAlternateFvBlockGuid</GuidCName>

+    </GuidCNames>

+  </Guids>

+  <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

+    <Extern>

+      <ModuleEntryPoint>VariableServiceInitialize</ModuleEntryPoint>

+    </Extern>

+    <Extern>

+      <SetVirtualAddressMapCallBack>VariableClassAddressChangeEvent</SetVirtualAddressMapCallBack>

+    </Extern>

+  </Externs>

+  <PcdCoded>

+    <PcdEntry PcdItemType="DYNAMIC">

+      <C_Name>PcdFlashNvStorageVariableBase</C_Name>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>

+        The driver gets the Variable store base address from this PCD.  This base address point to

+        an EFI_FIRMWARE_VOLUMN_HEADER struct.

+      </HelpText>

+    </PcdEntry>      

+    <PcdEntry PcdItemType="DYNAMIC">

+      <C_Name>PcdFlashNvStorageVariableSize</C_Name>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>

+        The driver gets the NvStorage Variable Size from this PCD.

+      </HelpText>      

+    </PcdEntry>     

+  </PcdCoded>  

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/x64Variable.dxs b/EdkModulePkg/Universal/Variable/RuntimeDxe/x64Variable.dxs
deleted file mode 100644
index e6d92ef9fd..0000000000
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/x64Variable.dxs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*++

-

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

-

-Module Name:

-

-  x64Variable.dxs

-

-Abstract:

-

-  Dependency expression source file.

-  

---*/

-#include <AutoGen.h>

-#include "DxeDepex.h"

-

-DEPENDENCY_START

-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL_GUID AND

-  EFI_ALTERNATE_FV_BLOCK_GUID             AND

-  EFI_FTW_LITE_PROTOCOL_GUID

-DEPENDENCY_END
\ No newline at end of file