diff options
| author | danh-arm <dan.handley@arm.com> | 2014-05-08 12:00:10 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-05-08 12:00:10 +0100 |
| commit | 8067ae3ff63c258df753b893eabfe4c8a852bd8a (patch) | |
| tree | 540c27eef13eb6ba5b6b451742f6cfb199dc9ddb /plat | |
| parent | a1ec2f4c9aa089fe938b8d233ebd18c389cbad78 (diff) | |
| parent | 228a9f0b443196a9172f89facdd8a40ea43767a2 (diff) | |
| download | arm-trusted-firmware-8067ae3ff63c258df753b893eabfe4c8a852bd8a.tar.gz | |
Merge pull request #61 from athoelke/use-mrs-msr-from-assembler-v2
Use MRS/MSR instructions in assembler code v2
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/fvp/aarch64/bl1_plat_helpers.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plat/fvp/aarch64/bl1_plat_helpers.S b/plat/fvp/aarch64/bl1_plat_helpers.S index 92075ea..b4d4458 100644 --- a/plat/fvp/aarch64/bl1_plat_helpers.S +++ b/plat/fvp/aarch64/bl1_plat_helpers.S @@ -67,7 +67,7 @@ func plat_secondary_cold_boot_setup * loader zeroes out the zi section. * --------------------------------------------- */ - bl read_mpidr + mrs x0, mpidr_el1 ldr x1, =PWRC_BASE str w0, [x1, #PPOFFR_OFF] @@ -173,8 +173,6 @@ func platform_mem_init func platform_cold_boot_init mov x20, x0 bl platform_mem_init - bl read_mpidr - mov x19, x0 /* --------------------------------------------- * Give ourselves a small coherent stack to @@ -182,6 +180,7 @@ func platform_cold_boot_init * CCI in assembler * --------------------------------------------- */ + mrs x0, mpidr_el1 bl platform_set_coherent_stack /* --------------------------------------------- @@ -200,7 +199,7 @@ func platform_cold_boot_init * -IS-WBWA memory * --------------------------------------------- */ - mov x0, x19 + mrs x0, mpidr_el1 bl platform_set_stack /* --------------------------------------------- |