Add Pei postfix to variable peim driver

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

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 5000797dc33b4de0640196d9bf8862380b11dd4d..0b1d6fcafc3173aeb4189cf51148f641029eb718 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -413,7 +413,7 @@
   $(WORKSPACE)/MdeModulePkg/Universal/RuntimeDxe/Runtime.inf\r
 \r
   $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf\r
-  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/DebugSupportDxe/DebugSupport.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/DebugPortDxe/DebugPort.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.inf b/MdeModulePkg/Universal/VariablePei/Variable.inf
deleted file mode 100644 (file)
index 72a6b79..0000000
--- a/MdeModulePkg/Universal/VariablePei/Variable.inf
+++ /dev/null
@@ -1,69 +0,0 @@
-#/** @file\r
-# Component description file for PeiVariable module.\r
-#\r
-# Framework PEIM to provide the Variable functionality.\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
-#\r
-#  All rights reserved. This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution. The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#\r
-#**/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PeiVariable\r
-  FILE_GUID                      = 34C8C28F-B61C-45a2-8F2E-89E46BECC63B\r
-  MODULE_TYPE                    = PEIM\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = PeimInitializeVariableServices\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-\r
-[Sources.common]\r
-  Variable.c\r
-  Variable.h\r
-\r
-[Sources.Ia32]\r
-  VariableWorker.c\r
-\r
-[Sources.X64]\r
-  VariableWorker.c\r
-\r
-[Sources.IPF]\r
-  Ipf/VariableWorker.c\r
-\r
-[Sources.EBC]\r
-  VariableWorker.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseMemoryLib\r
-  PcdLib\r
-  HobLib\r
-  PeimEntryPoint\r
-  DebugLib\r
-  PeiServiceTablePointerLib\r
-\r
-[Ppis]\r
-  gEfiPeiReadOnlyVariable2PpiGuid                # PPI ALWAYS_CONSUMED\r
-\r
-[PcdsDynamic.common]\r
-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid\r
-\r
-[Depex]\r
-  TRUE\r

diff --git a/MdeModulePkg/Universal/VariablePei/VariablePei.inf b/MdeModulePkg/Universal/VariablePei/VariablePei.inf
new file mode 100644 (file)
index 0000000..72a6b79
--- /dev/null
+++ b/MdeModulePkg/Universal/VariablePei/VariablePei.inf
@@ -0,0 +1,69 @@
+#/** @file\r
+# Component description file for PeiVariable module.\r
+#\r
+# Framework PEIM to provide the Variable functionality.\r
+# Copyright (c) 2006 - 2007, Intel Corporation\r
+#\r
+#  All rights reserved. This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution. The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = PeiVariable\r
+  FILE_GUID                      = 34C8C28F-B61C-45a2-8F2E-89E46BECC63B\r
+  MODULE_TYPE                    = PEIM\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = PeimInitializeVariableServices\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+\r
+[Sources.common]\r
+  Variable.c\r
+  Variable.h\r
+\r
+[Sources.Ia32]\r
+  VariableWorker.c\r
+\r
+[Sources.X64]\r
+  VariableWorker.c\r
+\r
+[Sources.IPF]\r
+  Ipf/VariableWorker.c\r
+\r
+[Sources.EBC]\r
+  VariableWorker.c\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  MdeModulePkg/MdeModulePkg.dec\r
+\r
+[LibraryClasses]\r
+  BaseMemoryLib\r
+  PcdLib\r
+  HobLib\r
+  PeimEntryPoint\r
+  DebugLib\r
+  PeiServiceTablePointerLib\r
+\r
+[Ppis]\r
+  gEfiPeiReadOnlyVariable2PpiGuid                # PPI ALWAYS_CONSUMED\r
+\r
+[PcdsDynamic.common]\r
+  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid\r
+\r
+[Depex]\r
+  TRUE\r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index fb657c7d2c63de606b7583ee1ba940ede523c5ed..bad4ce74f58cdd9b5ba2f99e54d4fef542e888c7 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -364,7 +364,7 @@
   $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf\r
-  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFwh.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 610c8e5007040bb8e15e6a2398f5e167e0038418..2570eb1bdeaa09e8c6681e0115fc895cd9c2fdce 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -118,7 +118,7 @@ INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode
 INF  $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf\r
-INF  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf\r
+INF  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFwh.inf\r
 INF  $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf\r