diff options
| author | danh-arm <dan.handley@arm.com> | 2015-03-17 14:23:46 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-03-17 14:23:46 +0000 |
| commit | 27bc0106665eddf3e6f84101e73e27b823867bef (patch) | |
| tree | 951f6ed4e9e9b1fd0bc157719246471ba48f83af /bl31 | |
| parent | 09c731ebd62348f7acd9ab94be033f0ae176a87f (diff) | |
| parent | 12e7c4ab0bbc9d9d4e950bdbda5a86f61c13bc1a (diff) | |
Merge pull request #268 from vikramkanigiri/vk/move_init_cpu_ops
Initialise cpu ops after enabling data cache
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/bl31_arch_setup.c | 4 | ||||
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/bl31/aarch64/bl31_arch_setup.c b/bl31/aarch64/bl31_arch_setup.c index a88b029e..edf10188 100644 --- a/bl31/aarch64/bl31_arch_setup.c +++ b/bl31/aarch64/bl31_arch_setup.c @@ -33,6 +33,7 @@ #include <assert.h> #include <bl_common.h> #include <bl31.h> +#include <cpu_data.h> #include <platform.h> /******************************************************************************* @@ -47,4 +48,7 @@ void bl31_arch_setup(void) /* Program the counter frequency */ write_cntfrq_el0(plat_get_syscnt_freq()); + + /* Initialize the cpu_ops pointer. */ + init_cpu_ops(); } diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 01d7a7f5..186b1cbc 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -162,12 +162,6 @@ func bl31_entrypoint #endif /* --------------------------------------------- - * Initialize the cpu_ops pointer. - * --------------------------------------------- - */ - bl init_cpu_ops - - /* --------------------------------------------- * Use SP_EL0 for the C runtime stack. * --------------------------------------------- */ |