diff options
| author | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-06-27 14:10:04 +0100 |
|---|---|---|
| committer | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-06-27 14:10:04 +0100 |
| commit | dac1235a94f4633b838598fb40e03e350e89f089 (patch) | |
| tree | cef294269082907c4e0358a22b9063bcd2736092 /bl31 | |
| parent | 1122e246847d1b5830ddff6ed111f526a73eb99d (diff) | |
| parent | 03396c435a6fabf1eec3d83360e1bdbaaf6f0f90 (diff) | |
Merge pull request #151 from vikramkanigiri/vk/t133-code-readability
Simplify entry point information generation code on FVP
Diffstat (limited to 'bl31')
| -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 e4dfea4..6e48e31 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -104,6 +104,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 |