diff options
author | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-06-02 14:59:00 +0100 |
---|---|---|
committer | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-06-24 11:19:43 +0100 |
commit | 03396c435a6fabf1eec3d83360e1bdbaaf6f0f90 (patch) | |
tree | 565eac2798c3f6abad18e9e58e19e2b2f336d8bb /bl31/aarch64 | |
parent | e869310f67344cd1f2b531cff38fa8cb4d319d58 (diff) |
Simplify entry point information generation code on FVP
This patch reworks FVP specific code responsible for determining
the entry point information for BL3-2 and BL3-3 stages when BL3-1
is configured as the reset handler.
Change-Id: Ia661ff0a6a44c7aabb0b6c1684b2e8d3642d11ec
Diffstat (limited to 'bl31/aarch64')
-rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 3c9042b..6b3ae6a 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -102,6 +102,10 @@ func bl31_entrypoint msr cptr_el3, x1 #if RESET_TO_BL31 + /* ------------------------------------------------------- + * Will not return from this macro if it is a warm boot. + * ------------------------------------------------------- + */ wait_for_entrypoint bl platform_mem_init #else |