Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
7 years ago
by
davidcunado-arm
Committed by
GitHub
7 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1086 from robertovargas-arm/dead_loop
juno: Fix bug in plat_get_my_entrypoint
parents
8b6385de
d9b7636e
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plat/arm/board/juno/aarch64/juno_helpers.S
+2
-5
plat/arm/board/juno/aarch64/juno_helpers.S
with
2 additions
and
5 deletions
+2
-5
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 */
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help