aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2020-03-26 13:18:48 +0900
committerSandrine Bailleux <sandrine.bailleux@arm.com>2020-04-01 16:40:16 +0200
commit2765ffdc99af8b5fc171771b5f0e04e96a74a52f (patch)
treea3e983c39bd3684b39b99b32b843397687941441 /plat
parenta5bb389a8292a6d8e14c1b38ef83414165fbbcf1 (diff)
downloadtrusted-firmware-a-2765ffdc99af8b5fc171771b5f0e04e96a74a52f.tar.gz
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'plat')
-rw-r--r--plat/socionext/uniphier/tsp/uniphier_tsp_setup.c2
-rw-r--r--plat/socionext/uniphier/uniphier_bl2_setup.c1
-rw-r--r--plat/socionext/uniphier/uniphier_bl31_setup.c2
-rw-r--r--plat/socionext/uniphier/uniphier_xlat_setup.c2
4 files changed, 2 insertions, 5 deletions
diff --git a/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c b/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c
index 091a6f7a96..4bbb2595c4 100644
--- a/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c
+++ b/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c
@@ -9,7 +9,6 @@
#include <platform_def.h>
#include <common/bl_common.h>
-#include <lib/xlat_tables/xlat_mmu_helpers.h>
#include <plat/common/platform.h>
#include "../uniphier.h"
@@ -32,5 +31,4 @@ void tsp_platform_setup(void)
void tsp_plat_arch_setup(void)
{
uniphier_mmap_setup(uniphier_soc);
- enable_mmu_el1(0);
}
diff --git a/plat/socionext/uniphier/uniphier_bl2_setup.c b/plat/socionext/uniphier/uniphier_bl2_setup.c
index 7a7f78681e..679f14d0ad 100644
--- a/plat/socionext/uniphier/uniphier_bl2_setup.c
+++ b/plat/socionext/uniphier/uniphier_bl2_setup.c
@@ -44,7 +44,6 @@ void bl2_el3_plat_arch_setup(void)
int ret;
uniphier_mmap_setup(uniphier_soc);
- enable_mmu_el3(0);
/* add relocation offset (run-time-address - link-address) */
uniphier_mem_base += BL_CODE_BASE - BL2_BASE;
diff --git a/plat/socionext/uniphier/uniphier_bl31_setup.c b/plat/socionext/uniphier/uniphier_bl31_setup.c
index f2f0b298a7..c2baebde92 100644
--- a/plat/socionext/uniphier/uniphier_bl31_setup.c
+++ b/plat/socionext/uniphier/uniphier_bl31_setup.c
@@ -14,7 +14,6 @@
#include <common/debug.h>
#include <drivers/console.h>
#include <lib/mmio.h>
-#include <lib/xlat_tables/xlat_mmu_helpers.h>
#include <plat/common/platform.h>
#include "uniphier.h"
@@ -87,5 +86,4 @@ void bl31_platform_setup(void)
void bl31_plat_arch_setup(void)
{
uniphier_mmap_setup(uniphier_soc);
- enable_mmu_el3(0);
}
diff --git a/plat/socionext/uniphier/uniphier_xlat_setup.c b/plat/socionext/uniphier/uniphier_xlat_setup.c
index 66c7834f54..c2ac7a29a4 100644
--- a/plat/socionext/uniphier/uniphier_xlat_setup.c
+++ b/plat/socionext/uniphier/uniphier_xlat_setup.c
@@ -63,4 +63,6 @@ void uniphier_mmap_setup(unsigned int soc)
MT_DEVICE | MT_RW | MT_SECURE);
init_xlat_tables();
+
+ enable_mmu(0);
}