summaryrefslogtreecommitdiff
path: root/bl2
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2014-07-28 14:24:52 +0100
committerdanh-arm <dan.handley@arm.com>2014-07-28 14:24:52 +0100
commitd9b1128b438748ce7ccfd33804321da2eed6fcfd (patch)
tree838d8022c6db8516721432ec43bd64f7614516a9 /bl2
parent592dd7cbe658cc33ae2818c9ed543ac57e97f784 (diff)
parent539a7b383d52493a94df4f5da8f74aa102429fa0 (diff)
Merge pull request #169 from achingupta/ag/tf-issues#198
Ag/tf issues#198
Diffstat (limited to 'bl2')
-rw-r--r--bl2/aarch64/bl2_entrypoint.S17
1 files changed, 6 insertions, 11 deletions
diff --git a/bl2/aarch64/bl2_entrypoint.S b/bl2/aarch64/bl2_entrypoint.S
index 09eadff2..c615baf6 100644
--- a/bl2/aarch64/bl2_entrypoint.S
+++ b/bl2/aarch64/bl2_entrypoint.S
@@ -96,12 +96,15 @@ func bl2_entrypoint
bl zeromem16
/* --------------------------------------------
- * Give ourselves a small coherent stack to
- * ease the pain of initializing the MMU
+ * Allocate a stack whose memory will be marked
+ * as Normal-IS-WBWA when the MMU is enabled.
+ * There is no risk of reading stale stack
+ * memory after enabling the MMU as only the
+ * primary cpu is running at the moment.
* --------------------------------------------
*/
mrs x0, mpidr_el1
- bl platform_set_coherent_stack
+ bl platform_set_stack
/* ---------------------------------------------
* Perform early platform setup & platform
@@ -113,14 +116,6 @@ func bl2_entrypoint
bl bl2_plat_arch_setup
/* ---------------------------------------------
- * Give ourselves a stack allocated in Normal
- * -IS-WBWA memory
- * ---------------------------------------------
- */
- mrs x0, mpidr_el1
- bl platform_set_stack
-
- /* ---------------------------------------------
* Jump to main function.
* ---------------------------------------------
*/