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
2c269b47
Unverified
Commit
2c269b47
authored
6 years ago
by
Soby Mathew
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1904 from lmayencourt/lm/move_pie_fixup
PIE: Fix reloc at the beginning of bl31 entrypoint
parents
981db33f
330ead80
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
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
bl31/aarch64/bl31_entrypoint.S
+13
-12
bl31/aarch64/bl31_entrypoint.S
with
13 additions
and
12 deletions
+13
-12
bl31/aarch64/bl31_entrypoint.S
View file @
2c269b47
...
...
@@ -23,7 +23,6 @@
*/
func
bl31_entrypoint
#if !RESET_TO_BL31
/
*
---------------------------------------------------------------
*
Stash
the
previous
bootloader
arguments
x0
-
x3
for
later
use
.
*
---------------------------------------------------------------
...
...
@@ -33,6 +32,18 @@ func bl31_entrypoint
mov
x22
,
x2
mov
x23
,
x3
/
*
--------------------------------------------------------------------
*
If
PIE
is
enabled
,
fixup
the
Global
descriptor
Table
and
dynamic
*
relocations
*
--------------------------------------------------------------------
*/
#if ENABLE_PIE
mov_imm
x0
,
BL31_BASE
mov_imm
x1
,
BL31_LIMIT
bl
fixup_gdt_reloc
#endif /* ENABLE_PIE */
#if !RESET_TO_BL31
/
*
---------------------------------------------------------------------
*
For
!
RESET_TO_BL31
systems
,
only
the
primary
CPU
ever
reaches
*
bl31_entrypoint
()
during
the
cold
boot
flow
,
so
the
cold
/
warm
boot
...
...
@@ -50,6 +61,7 @@ func bl31_entrypoint
_init_c_runtime
=1
\
_exception_vectors
=
runtime_exceptions
#else
/
*
---------------------------------------------------------------------
*
For
RESET_TO_BL31
systems
which
have
a
programmable
reset
address
,
*
bl31_entrypoint
()
is
executed
only
on
the
cold
boot
path
so
we
can
...
...
@@ -76,17 +88,6 @@ func bl31_entrypoint
mov
x23
,
0
#endif /* RESET_TO_BL31 */
/
*
--------------------------------------------------------------------
*
If
PIE
is
enabled
,
fixup
the
Global
descriptor
Table
and
dynamic
*
relocations
*
--------------------------------------------------------------------
*/
#if ENABLE_PIE
mov_imm
x0
,
BL31_BASE
mov_imm
x1
,
BL31_LIMIT
bl
fixup_gdt_reloc
#endif /* ENABLE_PIE */
/
*
--------------------------------------------------------------------
*
Perform
BL31
setup
*
--------------------------------------------------------------------
...
...
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