aboutsummaryrefslogtreecommitdiff
path: root/bl1/aarch64
diff options
context:
space:
mode:
authorAndrew Thoelke <andrew.thoelke@arm.com>2014-06-27 14:10:04 +0100
committerAndrew Thoelke <andrew.thoelke@arm.com>2014-06-27 14:10:04 +0100
commitdac1235a94f4633b838598fb40e03e350e89f089 (patch)
treecef294269082907c4e0358a22b9063bcd2736092 /bl1/aarch64
parent1122e246847d1b5830ddff6ed111f526a73eb99d (diff)
parent03396c435a6fabf1eec3d83360e1bdbaaf6f0f90 (diff)
downloadtrusted-firmware-a-dac1235a94f4633b838598fb40e03e350e89f089.tar.gz
Merge pull request #151 from vikramkanigiri/vk/t133-code-readability
Simplify entry point information generation code on FVP
Diffstat (limited to 'bl1/aarch64')
-rw-r--r--bl1/aarch64/bl1_entrypoint.S10
1 files changed, 3 insertions, 7 deletions
diff --git a/bl1/aarch64/bl1_entrypoint.S b/bl1/aarch64/bl1_entrypoint.S
index cbbaeaddfc..50cfae65c4 100644
--- a/bl1/aarch64/bl1_entrypoint.S
+++ b/bl1/aarch64/bl1_entrypoint.S
@@ -98,13 +98,9 @@ func bl1_entrypoint
bic w0, w0, #TFP_BIT
msr cptr_el3, x0
- /* ---------------------------------------------
- * Find the type of reset and jump to handler
- * if present. If the handler is null then it is
- * a cold boot. The primary cpu will set up the
- * platform while the secondaries wait for
- * their turn to be woken up
- * ---------------------------------------------
+ /* -------------------------------------------------------
+ * Will not return from this macro if it is a warm boot.
+ * -------------------------------------------------------
*/
wait_for_entrypoint