diff options
| author | danh-arm <dan.handley@arm.com> | 2018-05-03 16:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 16:45:01 +0100 |
| commit | bf0c112993a3014f04c25c94c705231f576436a3 (patch) | |
| tree | c8d7efe847528f78587f0231984302917842d2d9 /bl2/bl2_main.c | |
| parent | e9eb1460121709a9509f428fb94c8bd4a913361c (diff) | |
| parent | 01a1f7c2bc12b7fcb5cbb70c4091b0ac9ce79d4a (diff) | |
Merge pull request #1364 from Yann-lms/bl2_at_el3_mmu
BL2_AT_EL3: do not try to disable MMU twice on AARCH32
Diffstat (limited to 'bl2/bl2_main.c')
| -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(); /* |