Skip to content

GitLab

Unverified Commit bf0c1129 authored by danh-arm's avatar danh-arm Committed by GitHub
Browse files

Merge pull request #1364 from Yann-lms/bl2_at_el3_mmu 

BL2_AT_EL3: do not try to disable MMU twice on AARCH32
parents e9eb1460 01a1f7c2
Hide whitespace changes
Inline Side-by-side
bl2/bl2_main.c
View file @ bf0c1129
...@@ -46,6 +46,7 @@ void bl2_main(void) ...@@ -46,6 +46,7 @@ void bl2_main(void)
/* Load the subsequent bootloader images. */ /* Load the subsequent bootloader images. */
next_bl_ep_info = bl2_load_images(); next_bl_ep_info = bl2_load_images();
#if !BL2_AT_EL3
#ifdef AARCH32 #ifdef AARCH32
/* /*
* For AArch32 state BL1 and BL2 share the MMU setup. * For AArch32 state BL1 and BL2 share the MMU setup.
...@@ -55,8 +56,6 @@ void bl2_main(void) ...@@ -55,8 +56,6 @@ void bl2_main(void)
disable_mmu_icache_secure(); disable_mmu_icache_secure();
#endif /* AARCH32 */ #endif /* AARCH32 */
#if !BL2_AT_EL3
console_flush(); console_flush();
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment