diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-09-11 09:50:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 09:50:11 +0100 |
| commit | ff07ca2097dad0a70dc546206f8411426683e28f (patch) | |
| tree | 0ef04b88407262e1a88083e055a5ca605bdab495 | |
| parent | 8b6385deb379c1e36e2d729e5c5dd9a5f30bb04f (diff) | |
| parent | d9b7636e2b53089a466257d3b03195b01a2fca43 (diff) | |
Merge pull request #1086 from robertovargas-arm/dead_loop
juno: Fix bug in plat_get_my_entrypoint
| -rw-r--r-- | plat/arm/board/juno/aarch64/juno_helpers.S | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plat/arm/board/juno/aarch64/juno_helpers.S b/plat/arm/board/juno/aarch64/juno_helpers.S index 5e7f08e7..29c2c0a5 100644 --- a/plat/arm/board/juno/aarch64/juno_helpers.S +++ b/plat/arm/board/juno/aarch64/juno_helpers.S @@ -199,6 +199,7 @@ func juno_do_reset_to_aarch32_state msr rmr_el3, x0 isb wfi + b plat_panic_handler endfunc juno_do_reset_to_aarch32_state /* ----------------------------------------------------- @@ -233,8 +234,6 @@ func plat_get_my_entrypoint ldr x0, [x0] cbz x0, return b juno_do_reset_to_aarch32_state -1: - b 1b return: ret endfunc plat_get_my_entrypoint @@ -287,9 +286,7 @@ func juno_reset_to_aarch32_state str w1, [x3], #4 str w2, [x3] - bl juno_do_reset_to_aarch32_state -1: - b 1b + b juno_do_reset_to_aarch32_state endfunc juno_reset_to_aarch32_state #endif /* JUNO_AARCH32_EL3_RUNTIME */ |