diff options
| author | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-06-02 12:38:12 +0100 |
|---|---|---|
| committer | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-06-17 11:20:00 +0100 |
| commit | ee94cc6fa6dc11229a53c3b66d2ce3487bb3b08f (patch) | |
| tree | 2d6c57c937294183bd284706aca62d47aa3022f7 /bl31/bl31_main.c | |
| parent | 5e910074245fa180cfbe70d3c8bceeff1eaa026e (diff) | |
| download | arm-trusted-firmware-ee94cc6fa6dc11229a53c3b66d2ce3487bb3b08f.tar.gz | |
Remove early_exceptions from BL3-1
The crash reporting support and early initialisation of the
cpu_data allow the runtime_exception vectors to be used from
the start in BL3-1, removing the need for the additional
early_exception vectors and 2KB of code from BL3-1.
Change-Id: I5f8997dabbaafd8935a7455910b7db174a25d871
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 5bb11ba3c..6f88e6562 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -71,7 +71,6 @@ void bl31_lib_init() ******************************************************************************/ void bl31_main(void) { - /* Perform remaining generic architectural setup from EL3 */ bl31_arch_setup(); @@ -89,16 +88,7 @@ void bl31_main(void) /* Clean caches before re-entering normal world */ dcsw_op_all(DCCSW); - /* - * Use the more complex exception vectors now that context - * management is setup. SP_EL3 should point to a 'cpu_context' - * structure which has an exception stack allocated. The PSCI - * service should have set the context. - */ - assert(cm_get_context(NON_SECURE)); - cm_set_next_eret_context(NON_SECURE); - write_vbar_el3((uint64_t) runtime_exceptions); - isb(); + /* By default run the non-secure BL3-3 image next */ next_image_type = NON_SECURE; /* |