AArch32: Add BL2U support

[project/bcm63xx/atf.git] / bl2u / bl2u_main.c

diff --git a/bl2u/bl2u_main.c b/bl2u/bl2u_main.c
index 3ed5be73d430f9d3fd2c7a95832cc4540886c5fe..820da100e0454069d7281c7b1d6607530c5680cc 100644 (file)
--- a/bl2u/bl2u_main.c
+++ b/bl2u/bl2u_main.c
@@ -1,31 +1,7 @@
 /*
  * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of ARM nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <arch.h>
@@ -66,6 +42,15 @@ void bl2u_main(void)
 
        console_flush();
 
+#ifdef AARCH32
+       /*
+        * For AArch32 state BL1 and BL2U share the MMU setup.
+        * Given that BL2U does not map BL1 regions, MMU needs
+        * to be disabled in order to go back to BL1.
+        */
+       disable_mmu_icache_secure();
+#endif /* AARCH32 */
+
        /*
         * Indicate that BL2U is done and resume back to
         * normal world via an SMC to BL1.