Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
ff07ca20
Commit
ff07ca20
authored
Sep 11, 2017
by
davidcunado-arm
Committed by
GitHub
Sep 11, 2017
Browse files
Merge pull request #1086 from robertovargas-arm/dead_loop
juno: Fix bug in plat_get_my_entrypoint
parents
8b6385de
d9b7636e
Changes
1
Hide 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
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
1
b
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
1
b
b
juno_do_reset_to_aarch32_state
endfunc
juno_reset_to_aarch32_state
#endif /* JUNO_AARCH32_EL3_RUNTIME */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment