diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2012-09-07 19:21:54 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2012-10-23 12:51:37 +0100 |
| commit | b7cb57e76268c5bf8322497176d76b614f15fc19 (patch) | |
| tree | 4e088cec07b66f6499bfd444c4070ce89bcabb07 | |
| parent | ea5fb9fe0fc1adbfaa7d1f6820b66e71cf23a488 (diff) | |
TC1: fix memory init
Latest code tree has changed the order that things get called so we have to move the memory init to a different place
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15x2/CTA15x2Boot.S | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15x2/CTA15x2Boot.S b/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15x2/CTA15x2Boot.S index 484d7b65a..f09d2cf1e 100644 --- a/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15x2/CTA15x2Boot.S +++ b/edk2/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15x2/CTA15x2Boot.S @@ -49,6 +49,20 @@ ASM_PFX(ArmPlatformSecBootAction): **/ ASM_PFX(ArmPlatformInitializeBootMemory): + bx lr + + +/** + Initialize the memory where the initial stacks will reside + + This memory can contain the initial stacks (Secure and Secure Monitor stacks). + In some platform, this region is already initialized and the implementation of this function can + do nothing. This memory can also represent the Secure RAM. + This function is called before the satck has been set up. Its implementation must ensure the stack + pointer is not used (probably required to use assembly language) + +**/ +ASM_PFX(ArmPlatformSecBootMemoryInit): mov r8, lr bl smc_init bl dmc_init @@ -454,17 +468,3 @@ waitloop_14: bx lr // end of dmc_init -/** - Initialize the memory where the initial stacks will reside - - This memory can contain the initial stacks (Secure and Secure Monitor stacks). - In some platform, this region is already initialized and the implementation of this function can - do nothing. This memory can also represent the Secure RAM. - This function is called before the satck has been set up. Its implementation must ensure the stack - pointer is not used (probably required to use assembly language) - -**/ -ASM_PFX(ArmPlatformSecBootMemoryInit): - bx lr - - |