ArmPlatformPkg/MemoryInitPeim: handle memory above 4 GB on 32-bit ARM

[mirror_edk2.git] / ArmPlatformPkg / MemoryInitPei / MemoryInitPeim.inf

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index 0d578648a7d4500b463a853cb6a72e3728fd9d53..2c14a9c826ffd7f084c7c5721efc22d1afc50973 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -1,14 +1,14 @@
 #/** @file\r
-#  \r
-#  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+#\r
+#  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
 #  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
-#  \r
+#\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
@@ -28,7 +28,6 @@
 \r
 [Sources]\r
   MemoryInitPeim.c\r
-  MemoryInitPeiLib.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -36,31 +35,28 @@
   EmbeddedPkg/EmbeddedPkg.dec\r
   ArmPkg/ArmPkg.dec\r
   ArmPlatformPkg/ArmPlatformPkg.dec\r
-  \r
+\r
 [LibraryClasses]\r
   PeimEntryPoint\r
   DebugLib\r
   HobLib\r
   ArmLib\r
   ArmPlatformLib\r
+  MemoryInitPeiLib\r
 \r
 [Guids]\r
   gEfiMemoryTypeInformationGuid\r
 \r
 [FeaturePcd]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r
+  gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec\r
 \r
 [FixedPcd]\r
-  gArmPlatformTokenSpaceGuid.PcdStandalone\r
-\r
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress\r
-  gArmTokenSpaceGuid.PcdNormalFdSize\r
+  gArmTokenSpaceGuid.PcdFdBaseAddress\r
+  gArmTokenSpaceGuid.PcdFdSize\r
 \r
-  gArmTokenSpaceGuid.PcdSystemMemoryBase\r
-  gArmTokenSpaceGuid.PcdSystemMemorySize\r
-  gArmPlatformTokenSpaceGuid.PcdSystemMemoryFixRegionSize\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize\r
-  \r
+\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType\r
@@ -70,6 +66,10 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData\r
-   \r
+\r
+[Pcd]\r
+  gArmTokenSpaceGuid.PcdSystemMemoryBase\r
+  gArmTokenSpaceGuid.PcdSystemMemorySize\r
+\r
 [Depex]\r
   TRUE\r