diff options
| author | Yann Gautier <yann.gautier@st.com> | 2018-04-26 19:07:17 +0200 |
|---|---|---|
| committer | Yann Gautier <yann.gautier@st.com> | 2018-04-26 19:07:34 +0200 |
| commit | 01a1f7c2bc12b7fcb5cbb70c4091b0ac9ce79d4a (patch) | |
| tree | 27bd2793014e7bba839ce8768e1dc47e7ec41850 /bl2 | |
| parent | a8d9550b527107b85703d7b4e93073e653ae95f7 (diff) | |
BL2_AT_EL3: do not try to disable MMU twice on AARCH32
If BL2_AT_EL3 is enabled, bl2_run_next_image is called at the end of BL2.
This function calls disable_mmu_icache_secure.
It is then useless to call it in bl2_main in that case.
fixes arm-software/tf-issues#582
Signed-off-by: Yann Gautier <yann.gautier@st.com>
Diffstat (limited to 'bl2')
| -rw-r--r-- | bl2/bl2_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c index 41d17455..101eb33d 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c @@ -46,6 +46,7 @@ void bl2_main(void) /* Load the subsequent bootloader images. */ next_bl_ep_info = bl2_load_images(); +#if !BL2_AT_EL3 #ifdef AARCH32 /* * For AArch32 state BL1 and BL2 share the MMU setup. @@ -55,8 +56,6 @@ void bl2_main(void) disable_mmu_icache_secure(); #endif /* AARCH32 */ - -#if !BL2_AT_EL3 console_flush(); /* |