From 8cfd2e24578ea90e3152c4167df6889edeb33730 Mon Sep 17 00:00:00 2001
From: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 4 Jul 2012 20:20:21 +0000
Subject: 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
---
 ArmPlatformPkg/Sec/SecEntryPoint.S | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ArmPlatformPkg/Sec/SecEntryPoint.S')

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)
   
-- 
cgit v1.2.3