diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-11-27 17:07:43 +0000 |
|---|---|---|
| committer | abiesheuvel <abiesheuvel@Edk2> | 2015-11-27 17:07:43 +0000 |
| commit | 982aa6a18e888e4b6bf2789f05468784200d599a (patch) | |
| tree | 5b485ec0f61e1b650b7d4a602a248cd5d1c69e2d | |
| parent | 3707dee3da5c58d91d64b56e4953736de69e06f6 (diff) | |
| download | edk2-982aa6a18e888e4b6bf2789f05468784200d599a.tar.gz | |
ArmPlatformPkg/Sec: remove global variable allocation from lowlevel init
Now that we dropped all ArmPlatformGlobalVariableLib dependencies,
there is no longer a need to allocate and clear out the global
variable region in the Sec init code. So remove it.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18995 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S | 6 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/Arm/SecEntryPoint.S | 6 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm | 6 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/Sec.inf | 2 |
4 files changed, 3 insertions, 17 deletions
diff --git a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S index 3512ccd84..000b56f57 100644 --- a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S @@ -99,11 +99,7 @@ _SetupPrimaryCoreStack: LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecPrimaryStackSize), x2)
add x1, x1, x2
- LoadConstantToReg (FixedPcdGet32(PcdSecGlobalVariableSize), x2)
-
- // The reserved space for global variable must be 8-bytes aligned for pushing
- // 64-bit variable on the stack
- SetPrimaryStack (x1, x2, x3, x4)
+ mov sp, x1
b _PrepareArguments
_SetupSecondaryCoreStack:
diff --git a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S index 51b91b965..73c264810 100644 --- a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S @@ -81,11 +81,7 @@ _SetupPrimaryCoreStack: LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecPrimaryStackSize), r2)
add r1, r1, r2
- LoadConstantToReg (FixedPcdGet32(PcdSecGlobalVariableSize), r2)
-
- // The reserved space for global variable must be 8-bytes aligned for pushing
- // 64-bit variable on the stack
- SetPrimaryStack (r1, r2, r3)
+ mov sp, r1
b _PrepareArguments
_SetupSecondaryCoreStack:
diff --git a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm index b30fab214..c0cd41069 100644 --- a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm +++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm @@ -83,11 +83,7 @@ _SetupPrimaryCoreStack LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecPrimaryStackSize), r2)
add r1, r1, r2
- LoadConstantToReg (FixedPcdGet32(PcdSecGlobalVariableSize), r2)
-
- // The reserved space for global variable must be 8-bytes aligned for pushing
- // 64-bit variable on the stack
- SetPrimaryStack (r1, r2, r3)
+ mov sp, r1
b _PrepareArguments
_SetupSecondaryCoreStack
diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf index 7c6e7ffba..7f7243f98 100644 --- a/ArmPlatformPkg/Sec/Sec.inf +++ b/ArmPlatformPkg/Sec/Sec.inf @@ -81,7 +81,5 @@ gArmTokenSpaceGuid.PcdGicDistributorBase
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
- gArmPlatformTokenSpaceGuid.PcdSecGlobalVariableSize
-
[FixedPcd.ARM]
gArmTokenSpaceGuid.PcdArmNsacr
|