ArmPkg: Replace single dead loop.

[mirror_edk2.git] / ArmPlatformPkg / PrePeiCore / AArch64 / PrePeiCoreEntryPoint.S

diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S b/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
index 5bdbe4585ffece243b32c2b42ce03b7c42e46551..05a823ba21a559c701e2d5fc96225ad6c055e787 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\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
@@ -43,13 +43,12 @@ ASM_PFX(_ModuleEntryPoint):
 // changes.\r
 \r
 // Which EL are we running at? Every EL needs some level of setup...\r
-  EL1_OR_EL2_OR_EL3(x0)\r
+// We should not run this code in EL3\r
+  EL1_OR_EL2(x0)\r
 1:bl    ASM_PFX(SetupExceptionLevel1)\r
   b     ASM_PFX(MainEntryPoint)\r
 2:bl    ASM_PFX(SetupExceptionLevel2)\r
   b     ASM_PFX(MainEntryPoint)\r
-3:// If we are at EL3 we die.\r
-  b     dead\r
 \r
 ASM_PFX(MainEntryPoint):\r
   // Identify CPU ID\r
@@ -109,6 +108,3 @@ _SetupPrimaryCoreStack:
   // 128-bit variable on the stack\r
   SetPrimaryStack (x1, x2, x3, x4)\r
   b     _PrepareArguments\r
-\r
-dead:\r
-  b     dead\r