commit 962a211401e4ab7129ec1cf594818f4beac73261
author danh-arm <dan.handley@arm.com> Thu May 03 16:45:01 2018 +0100
committer GitHub <noreply@github.com> Thu May 03 16:45:01 2018 +0100
tree c8d7efe847528f78587f0231984302917842d2d9
parent 5dab8ccd0a09305fc27dfd9b9a999dc568fea3b9
parent 60e5c2f615dccccf07337b873a3e404184fc1eaa

Merge pull request #1364 from Yann-lms/bl2_at_el3_mmu

BL2_AT_EL3: do not try to disable MMU twice on AARCH32

bl2/bl2_main.c

diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 41d1745..101eb33 100644
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -46,6 +46,7 @@
 	/* 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 @@
 	disable_mmu_icache_secure();
 #endif /* AARCH32 */
 
-
-#if !BL2_AT_EL3
 	console_flush();
 
 	/*