aboutsummaryrefslogtreecommitdiffstats
path: root/bl1
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 /bl1
parent592dd7cbe658cc33ae2818c9ed543ac57e97f784 (diff)
parent539a7b383d52493a94df4f5da8f74aa102429fa0 (diff)
downloadplatform_external_arm-trusted-firmware-d9b1128b438748ce7ccfd33804321da2eed6fcfd.tar.gz
platform_external_arm-trusted-firmware-d9b1128b438748ce7ccfd33804321da2eed6fcfd.tar.bz2
platform_external_arm-trusted-firmware-d9b1128b438748ce7ccfd33804321da2eed6fcfd.zip
Merge pull request #169 from achingupta/ag/tf-issues#198
Ag/tf issues#198
Diffstat (limited to 'bl1')
-rw-r--r--bl1/aarch64/bl1_entrypoint.S22
1 files changed, 8 insertions, 14 deletions
diff --git a/bl1/aarch64/bl1_entrypoint.S b/bl1/aarch64/bl1_entrypoint.S
index 50cfae65c..ac6d91331 100644
--- a/bl1/aarch64/bl1_entrypoint.S
+++ b/bl1/aarch64/bl1_entrypoint.S
@@ -130,14 +130,16 @@ func bl1_entrypoint
ldr x2, =__DATA_SIZE__
bl memcpy16
- /* ---------------------------------------------
- * Give ourselves a small coherent stack to
- * ease the pain of initializing the MMU and
- * CCI in assembler
- * ---------------------------------------------
+ /* --------------------------------------------
+ * 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
/* ---------------------------------------------
* Architectural init. can be generic e.g.
@@ -150,14 +152,6 @@ func bl1_entrypoint
bl bl1_early_platform_setup
bl bl1_plat_arch_setup
- /* ---------------------------------------------
- * Give ourselves a stack allocated in Normal
- * -IS-WBWA memory
- * ---------------------------------------------
- */
- mrs x0, mpidr_el1
- bl platform_set_stack
-
/* --------------------------------------------------
* Initialize platform and jump to our c-entry point
* for this type of reset. Panic if it returns