summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2017-08-14 16:02:53 +0100
committerGitHub <noreply@github.com>2017-08-14 16:02:53 +0100
commit96ef670aeb8df5146d5cbba660dfdbf18daad65f (patch)
tree60380decb2ad22057591b564f237a63b82f5c93e
parenta937d93e5cba73b77c22d66266f56fe0f8319f60 (diff)
parent5c2c88b558a9dfcf5203057fa39d7a702d1bc433 (diff)
Merge pull request #1048 from douglas-raillard-arm/dr/fix_bl2u_entrypoint
Fix BL2U entrypoint possible parameter corruption
-rw-r--r--bl2u/aarch32/bl2u_entrypoint.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/bl2u/aarch32/bl2u_entrypoint.S b/bl2u/aarch32/bl2u_entrypoint.S
index 1fa669eb..7fb64f3e 100644
--- a/bl2u/aarch32/bl2u_entrypoint.S
+++ b/bl2u/aarch32/bl2u_entrypoint.S
@@ -32,7 +32,7 @@ func bl2u_entrypoint
* ---------------------------------------------
*/
mov r11, r1
- mov r12, r2
+ mov r10, r2
/* ---------------------------------------------
* Set the exception vector to something sane.
@@ -107,7 +107,7 @@ func bl2u_entrypoint
* ---------------------------------------------
*/
mov r0, r11
- mov r1, r12
+ mov r1, r10
bl bl2u_early_platform_setup
bl bl2u_plat_arch_setup