*\r
* Copyright (c) 2011-2014, 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
#include <Library/DebugAgentLib.h>\r
#include <Library/ArmLib.h>\r
\r
-#include <Ppi/ArmGlobalVariable.h>\r
-\r
#include "PrePeiCore.h"\r
\r
-EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mTemporaryRamSupportPpi = { PrePeiCoreTemporaryRamSupport };\r
-ARM_GLOBAL_VARIABLE_PPI mGlobalVariablePpi = { PrePeiCoreGetGlobalVariableMemory };\r
+CONST EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mTemporaryRamSupportPpi = { PrePeiCoreTemporaryRamSupport };\r
\r
-EFI_PEI_PPI_DESCRIPTOR gCommonPpiTable[] = {\r
+CONST EFI_PEI_PPI_DESCRIPTOR gCommonPpiTable[] = {\r
{\r
EFI_PEI_PPI_DESCRIPTOR_PPI,\r
&gEfiTemporaryRamSupportPpiGuid,\r
- &mTemporaryRamSupportPpi\r
- },\r
- {\r
- EFI_PEI_PPI_DESCRIPTOR_PPI,\r
- &gArmGlobalVariablePpiGuid,\r
- &mGlobalVariablePpi\r
+ (VOID *) &mTemporaryRamSupportPpi\r
}\r
};\r
\r
PlatformPpiListSize = 0;\r
ArmPlatformGetPlatformPpiList (&PlatformPpiListSize, &PlatformPpiList);\r
\r
- // Copy the Common and Platform PPis in Temporrary Memory\r
- ListBase = PcdGet32 (PcdCPUCoresStackBase);\r
+ // Copy the Common and Platform PPis in Temporary Memory\r
+ ListBase = PcdGet64 (PcdCPUCoresStackBase);\r
CopyMem ((VOID*)ListBase, gCommonPpiTable, sizeof(gCommonPpiTable));\r
CopyMem ((VOID*)(ListBase + sizeof(gCommonPpiTable)), PlatformPpiList, PlatformPpiListSize);\r
\r
VOID *NewHeap;\r
VOID *OldStack;\r
VOID *NewStack;\r
+ UINTN HeapSize;\r
+\r
+ HeapSize = ALIGN_VALUE (CopySize / 2, CPU_STACK_ALIGNMENT);\r
\r
OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
- NewHeap = (VOID*)((UINTN)PermanentMemoryBase + (CopySize >> 1));\r
+ NewHeap = (VOID*)((UINTN)PermanentMemoryBase + (CopySize - HeapSize));\r
\r
- OldStack = (VOID*)((UINTN)TemporaryMemoryBase + (CopySize >> 1));\r
+ OldStack = (VOID*)((UINTN)TemporaryMemoryBase + HeapSize);\r
NewStack = (VOID*)(UINTN)PermanentMemoryBase;\r
\r
//\r
// Migrate the temporary memory stack to permanent memory stack.\r
//\r
- CopyMem (NewStack, OldStack, CopySize >> 1);\r
+ CopyMem (NewStack, OldStack, CopySize - HeapSize);\r
\r
//\r
// Migrate the temporary memory heap to permanent memory heap.\r
//\r
- CopyMem (NewHeap, OldHeap, CopySize >> 1);\r
+ CopyMem (NewHeap, OldHeap, HeapSize);\r
\r
SecSwitchStack ((UINTN)NewStack - (UINTN)OldStack);\r
\r
return EFI_SUCCESS;\r
}\r
-\r
-EFI_STATUS\r
-PrePeiCoreGetGlobalVariableMemory (\r
- OUT EFI_PHYSICAL_ADDRESS *GlobalVariableBase\r
- )\r
-{\r
- ASSERT (GlobalVariableBase != NULL);\r
-\r
- *GlobalVariableBase = (UINTN)PcdGet32 (PcdCPUCoresStackBase) +\r
- (UINTN)PcdGet32 (PcdCPUCorePrimaryStackSize) -\r
- (UINTN)PcdGet32 (PcdPeiGlobalVariableSize);\r
-\r
- return EFI_SUCCESS;\r
-}\r
-\r