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

diff --git a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
index 3512ccd84dd2636fb58f7d48ab954d7143ac26ce..000b56f573e5329950a25805c000f7ab4f05bb73 100644 (file)
--- a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
@@ -99,11 +99,7 @@ _SetupPrimaryCoreStack:
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecPrimaryStackSize), x2)\r
   add   x1, x1, x2\r
 \r
-  LoadConstantToReg (FixedPcdGet32(PcdSecGlobalVariableSize), x2)\r
-\r
-  // The reserved space for global variable must be 8-bytes aligned for pushing\r
-  // 64-bit variable on the stack\r
-  SetPrimaryStack (x1, x2, x3, x4)\r
+  mov   sp, x1\r
   b     _PrepareArguments\r
 \r
 _SetupSecondaryCoreStack:\r

diff --git a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S
index 51b91b965d8b5708d1b4d84d0af24dbcbe9e0e59..73c264810e66880d522c50796160bf19c5509287 100644 (file)
--- a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.S
@@ -81,11 +81,7 @@ _SetupPrimaryCoreStack:
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecPrimaryStackSize), r2)\r
   add   r1, r1, r2\r
 \r
-  LoadConstantToReg (FixedPcdGet32(PcdSecGlobalVariableSize), r2)\r
-\r
-  // The reserved space for global variable must be 8-bytes aligned for pushing\r
-  // 64-bit variable on the stack\r
-  SetPrimaryStack (r1, r2, r3)\r
+  mov   sp, r1\r
   b     _PrepareArguments\r
 \r
 _SetupSecondaryCoreStack:\r

diff --git a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm
index b30fab2141feebe324b381f49aecd29e29e191d0..c0cd4106999174b14c8c0a01e7dc45657174da17 100644 (file)
--- a/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm
+++ b/ArmPlatformPkg/Sec/Arm/SecEntryPoint.asm
@@ -83,11 +83,7 @@ _SetupPrimaryCoreStack
   LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecPrimaryStackSize), r2)\r
   add   r1, r1, r2\r
 \r
-  LoadConstantToReg (FixedPcdGet32(PcdSecGlobalVariableSize), r2)\r
-\r
-  // The reserved space for global variable must be 8-bytes aligned for pushing\r
-  // 64-bit variable on the stack\r
-  SetPrimaryStack (r1, r2, r3)\r
+  mov   sp, r1\r
   b     _PrepareArguments\r
 \r
 _SetupSecondaryCoreStack\r

diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index 7c6e7ffba1c62cbfa88b9507cc3677dec6bf975f..7f7243f98f770073db88dc40aeb5d27cd23b7cd1 100644 (file)
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -81,7 +81,5 @@
   gArmTokenSpaceGuid.PcdGicDistributorBase\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdSecGlobalVariableSize\r
-\r
 [FixedPcd.ARM]\r
   gArmTokenSpaceGuid.PcdArmNsacr\r