Skip to content

GitLab

Commit ff07ca20 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #1086 from robertovargas-arm/dead_loop 

juno: Fix bug in plat_get_my_entrypoint
parents 8b6385de d9b7636e
Show whitespace changes
Inline Side-by-side
plat/arm/board/juno/aarch64/juno_helpers.S
View file @ ff07ca20
...@@ -199,6 +199,7 @@ func juno_do_reset_to_aarch32_state ...@@ -199,6 +199,7 @@ func juno_do_reset_to_aarch32_state
msr rmr_el3, x0 msr rmr_el3, x0
isb isb
wfi wfi
b plat_panic_handler
endfunc juno_do_reset_to_aarch32_state endfunc juno_do_reset_to_aarch32_state
/* ----------------------------------------------------- /* -----------------------------------------------------
...@@ -233,8 +234,6 @@ func plat_get_my_entrypoint ...@@ -233,8 +234,6 @@ func plat_get_my_entrypoint
ldr x0, [x0] ldr x0, [x0]
cbz x0, return cbz x0, return
b juno_do_reset_to_aarch32_state b juno_do_reset_to_aarch32_state
1:
b 1b
return: return:
ret ret
endfunc plat_get_my_entrypoint endfunc plat_get_my_entrypoint
...@@ -287,9 +286,7 @@ func juno_reset_to_aarch32_state ...@@ -287,9 +286,7 @@ func juno_reset_to_aarch32_state
str w1, [x3], #4 str w1, [x3], #4
str w2, [x3] str w2, [x3]
bl juno_do_reset_to_aarch32_state b juno_do_reset_to_aarch32_state
1:
b 1b
endfunc juno_reset_to_aarch32_state endfunc juno_reset_to_aarch32_state
#endif /* JUNO_AARCH32_EL3_RUNTIME */ #endif /* JUNO_AARCH32_EL3_RUNTIME */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment