ShellPkg/acpiview: GTDT updates for ACPI 6.3

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

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index 389a2e6f1abdc19553a074abbc81c3954c292068..485dad0ac8e1968f599db19ce60e18c7c915ce18 100644 (file)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -2,13 +2,7 @@
 *\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
+*  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 *\r
 **/\r
 \r
@@ -105,12 +99,12 @@ InitializeMemory (
 \r
   // Ensure PcdSystemMemorySize has been set\r
   ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
-  ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ADDRESS);\r
+  ASSERT (PcdGet64 (PcdSystemMemoryBase) < (UINT64)MAX_ALLOC_ADDRESS);\r
 \r
   SystemMemoryBase = (UINTN)PcdGet64 (PcdSystemMemoryBase);\r
   SystemMemoryTop = SystemMemoryBase + PcdGet64 (PcdSystemMemorySize);\r
-  if (SystemMemoryTop - 1 > MAX_ADDRESS) {\r
-    SystemMemoryTop = (UINT64)MAX_ADDRESS + 1;\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