Commit 2765ffdc authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Sandrine Bailleux
Browse files

uniphier: use enable_mmu() in common function



Currently, enable_mmu_el1() or enable_mmu_el3() is kept outside the
common function because the appropriate one must be chosen.

Use enable_mmu() and move it to the common function.

Change-Id: If2fb651691a7b6be05674f5cf730ae067ba95d4b
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent a5bb389a
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <platform_def.h> #include <platform_def.h>
#include <common/bl_common.h> #include <common/bl_common.h>
#include <lib/xlat_tables/xlat_mmu_helpers.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include "../uniphier.h" #include "../uniphier.h"
...@@ -32,5 +31,4 @@ void tsp_platform_setup(void) ...@@ -32,5 +31,4 @@ void tsp_platform_setup(void)
void tsp_plat_arch_setup(void) void tsp_plat_arch_setup(void)
{ {
uniphier_mmap_setup(uniphier_soc); uniphier_mmap_setup(uniphier_soc);
enable_mmu_el1(0);
} }
...@@ -44,7 +44,6 @@ void bl2_el3_plat_arch_setup(void) ...@@ -44,7 +44,6 @@ void bl2_el3_plat_arch_setup(void)
int ret; int ret;
uniphier_mmap_setup(uniphier_soc); uniphier_mmap_setup(uniphier_soc);
enable_mmu_el3(0);
/* add relocation offset (run-time-address - link-address) */ /* add relocation offset (run-time-address - link-address) */
uniphier_mem_base += BL_CODE_BASE - BL2_BASE; uniphier_mem_base += BL_CODE_BASE - BL2_BASE;
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <common/debug.h> #include <common/debug.h>
#include <drivers/console.h> #include <drivers/console.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/xlat_tables/xlat_mmu_helpers.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include "uniphier.h" #include "uniphier.h"
...@@ -87,5 +86,4 @@ void bl31_platform_setup(void) ...@@ -87,5 +86,4 @@ void bl31_platform_setup(void)
void bl31_plat_arch_setup(void) void bl31_plat_arch_setup(void)
{ {
uniphier_mmap_setup(uniphier_soc); uniphier_mmap_setup(uniphier_soc);
enable_mmu_el3(0);
} }
...@@ -63,4 +63,6 @@ void uniphier_mmap_setup(unsigned int soc) ...@@ -63,4 +63,6 @@ void uniphier_mmap_setup(unsigned int soc)
MT_DEVICE | MT_RW | MT_SECURE); MT_DEVICE | MT_RW | MT_SECURE);
init_xlat_tables(); init_xlat_tables();
enable_mmu(0);
} }
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