/** @file\r
*\r
* Copyright (c) 2011, ARM Limited. All rights reserved.\r
-* \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
-* 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
+* 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
+* 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
Info[7].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiLoaderCode);\r
Info[8].Type = EfiLoaderData;\r
Info[8].NumberOfPages = PcdGet32 (PcdMemoryTypeEfiLoaderData);\r
- \r
+\r
// Terminator for the list\r
Info[9].Type = EfiMaxMemoryType;\r
Info[9].NumberOfPages = 0;\r
\r
Routine Description:\r
\r
- \r
+\r
\r
Arguments:\r
\r
FileHandle - Handle of the file being invoked.\r
PeiServices - Describes the list of possible PEI Services.\r
- \r
+\r
Returns:\r
\r
Status - EFI_SUCCESS if the boot mode could be set\r
{\r
EFI_STATUS Status;\r
UINTN SystemMemoryBase;\r
- UINTN SystemMemoryTop;\r
+ UINT64 SystemMemoryTop;\r
UINTN FdBase;\r
UINTN FdTop;\r
UINTN UefiMemoryBase;\r
\r
- DEBUG ((EFI_D_ERROR, "Memory Init PEIM Loaded\n"));\r
+ DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Memory Init PEIM Loaded\n"));\r
\r
// Ensure PcdSystemMemorySize has been set\r
- ASSERT (FixedPcdGet32 (PcdSystemMemorySize) != 0);\r
+ ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
+ ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ALLOC_ADDRESS);\r
\r
- SystemMemoryBase = (UINTN)FixedPcdGet32 (PcdSystemMemoryBase);\r
- SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet32 (PcdSystemMemorySize);\r
- FdBase = (UINTN)PcdGet32 (PcdNormalFdBaseAddress);\r
- FdTop = FdBase + (UINTN)PcdGet32 (PcdNormalFdSize);\r
-\r
- //\r
- // Initialize the System Memory (DRAM)\r
- //\r
- if (!FeaturePcdGet (PcdSystemMemoryInitializeInSec)) {\r
- // In case the DRAM has not been initialized by the secure firmware\r
- ArmPlatformInitializeSystemMemory ();\r
+ SystemMemoryBase = (UINTN)PcdGet64 (PcdSystemMemoryBase);\r
+ SystemMemoryTop = SystemMemoryBase + PcdGet64 (PcdSystemMemorySize);\r
+ if (SystemMemoryTop - 1 > MAX_ALLOC_ADDRESS) {\r
+ SystemMemoryTop = (UINT64)MAX_ALLOC_ADDRESS + 1;\r
}\r
+ FdBase = (UINTN)PcdGet64 (PcdFdBaseAddress);\r
+ FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);\r
\r
//\r
// Declare the UEFI memory to PEI\r