2 files changed, 8 insertions, 6 deletions
diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
index 9215198d93..c0c20a9206 100755
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.S
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
 //
 //  This program and the accompanying materials
 //  are licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,8 @@
 #include <Library/PcdLib.h>
 #include <AutoGen.h>
 
+#include <Chipset/ArmV7.h>
+
 .text
 .align 3
 
@@ -35,8 +37,7 @@ ASM_PFX(_ModuleEntryPoint):
 
 _SetSVCMode:
   // Enter SVC mode, Disable FIQ and IRQ
-  //TODO: remove hardcoded values
-  mov     r1, #0x13|0x80|0x40
+  mov     r1, #(CPSR_MODE_SVC | CPSR_IRQ | CPSR_FIQ)
   msr     CPSR_c, r1
 
 // Check if we can install the stack at the top of the System Memory or if we need
diff --git a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
index 0dea1c3271..5efdb532af 100644
--- a/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
+++ b/ArmPlatformPkg/PrePi/ModuleEntryPoint.asm
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
 //
 //  This program and the accompanying materials
 //  are licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,8 @@
 #include <Library/PcdLib.h>
 #include <AutoGen.h>
 
+#include <Chipset/ArmV7.h>
+
   INCLUDE AsmMacroIoLib.inc
   
   IMPORT  CEntryPoint
@@ -37,8 +39,7 @@ _ModuleEntryPoint
 
 _SetSVCMode
   // Enter SVC mode, Disable FIQ and IRQ
-  //TODO: remove hardcoded values
-  mov     r1, #0x13 :OR: 0x80 :OR: 0x40
+  mov     r1, #(CPSR_MODE_SVC :OR: CPSR_IRQ :OR: CPSR_FIQ)
   msr     CPSR_c, r1
 
 // Check if we can install the stack at the top of the System Memory or if we need