Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
bf0c1129
Unverified
Commit
bf0c1129
authored
May 03, 2018
by
danh-arm
Committed by
GitHub
May 03, 2018
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
bl2/bl2_main.c
View file @
bf0c1129
...
...
@@ -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
();
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment