summaryrefslogtreecommitdiff
path: root/ArmPlatformPkg/Sec/SecEntryPoint.S
diff options
context:
space:
mode:
authoroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2012-07-04 20:20:21 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2012-07-04 20:20:21 +0000
commit8cfd2e24578ea90e3152c4167df6889edeb33730 (patch)
tree5c0fbb14c3e2d537198b063a83016f82f4b3e3c8 /ArmPlatformPkg/Sec/SecEntryPoint.S
parentae42bc88eecf25c449e3af7188e5fc7dc78f2b8f (diff)
downloadedk2-platforms-8cfd2e24578ea90e3152c4167df6889edeb33730.tar.xz
ArmPlatformPkg/Sec: Fixed Primary Non-Cold Boot Path
Signed-off-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13499 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg/Sec/SecEntryPoint.S')
-rw-r--r--ArmPlatformPkg/Sec/SecEntryPoint.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S
index 0c42a7baa5..5095c41697 100644
--- a/ArmPlatformPkg/Sec/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/SecEntryPoint.S
@@ -73,6 +73,10 @@ _WaitInitMem:
b _SetupSecondaryCoreStack
_InitMem:
+ // If we are not doing a cold boot in this case we should assume the Initial Memory to be already initialized
+ cmp r10, #ARM_SEC_COLD_BOOT
+ bne _SetupPrimaryCoreStack
+
// Initialize Init Boot Memory
bl ASM_PFX(ArmPlatformSecBootMemoryInit)