diff options
| author | danh-arm <dan.handley@arm.com> | 2014-06-23 13:06:05 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-06-23 13:06:05 +0100 |
| commit | 92152eecbb636cef93f491411ccca9edba63aaca (patch) | |
| tree | 652d530588a730169f041702d122467ab7766496 /bl31/aarch64/bl31_entrypoint.S | |
| parent | 2e35b924c47d98051d5acc87888b3f79445ff6b9 (diff) | |
| parent | ee94cc6fa6dc11229a53c3b66d2ce3487bb3b08f (diff) | |
Merge pull request #137 from athoelke/at/no-early-exceptions
Remove early_exceptions from BL3-1
Diffstat (limited to 'bl31/aarch64/bl31_entrypoint.S')
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 2e7476a1..e4dfea43 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -72,11 +72,13 @@ func bl31_entrypoint isb /* --------------------------------------------- - * Set the exception vector to something sane. + * Set the exception vector and zero tpidr_el3 + * until the crash reporting is set up * --------------------------------------------- */ - adr x1, early_exceptions + adr x1, runtime_exceptions msr vbar_el3, x1 + msr tpidr_el3, xzr /* --------------------------------------------------------------------- * The initial state of the Architectural feature trap register @@ -134,10 +136,10 @@ func bl31_entrypoint * Initialise cpu_data and crash reporting * --------------------------------------------- */ - bl init_cpu_data_ptr #if CRASH_REPORTING bl init_crash_reporting #endif + bl init_cpu_data_ptr /* --------------------------------------------- * Use SP_EL0 for the C runtime stack. |