summaryrefslogtreecommitdiff
path: root/plat/marvell
diff options
context:
space:
mode:
authorRemi Pommarel <repk@triplefau.lt>2019-07-14 20:34:28 +0200
committerRemi Pommarel <repk@triplefau.lt>2019-07-16 17:04:00 +0200
commit6e9e15b0b2aa22fca3354417a685320811e243e3 (patch)
treeca8474dce8f7a94283f662d4c97aca84c4ab40da /plat/marvell
parent3ce3ce07385a6fe55018d825318a9aba2dab7289 (diff)
marvell: Switch to xlat_tables_v2
Use v2 xlat tables library instead of v1 for marvell platforms. Signed-off-by: Remi Pommarel <repk@triplefau.lt> Change-Id: I838a6a878a8353e84eea9529721761b478943f0a
Diffstat (limited to 'plat/marvell')
-rw-r--r--plat/marvell/common/aarch64/marvell_common.c2
-rw-r--r--plat/marvell/common/marvell_common.mk5
2 files changed, 4 insertions, 3 deletions
diff --git a/plat/marvell/common/aarch64/marvell_common.c b/plat/marvell/common/aarch64/marvell_common.c
index ea0902cc..21a62d48 100644
--- a/plat/marvell/common/aarch64/marvell_common.c
+++ b/plat/marvell/common/aarch64/marvell_common.c
@@ -13,7 +13,7 @@
#include <arch_helpers.h>
#include <common/debug.h>
#include <lib/mmio.h>
-#include <lib/xlat_tables/xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat_marvell.h>
diff --git a/plat/marvell/common/marvell_common.mk b/plat/marvell/common/marvell_common.mk
index 5c8e804f..f41d7a47 100644
--- a/plat/marvell/common/marvell_common.mk
+++ b/plat/marvell/common/marvell_common.mk
@@ -20,12 +20,13 @@ $(eval $(call add_define,ARO_ENABLE))
LLC_ENABLE := 1
$(eval $(call add_define,LLC_ENABLE))
+include lib/xlat_tables_v2/xlat_tables.mk
+
PLAT_INCLUDES += -I$(MARVELL_PLAT_INCLUDE_BASE)/common \
-I$(MARVELL_PLAT_INCLUDE_BASE)/common/aarch64
-PLAT_BL_COMMON_SOURCES += lib/xlat_tables/xlat_tables_common.c \
- lib/xlat_tables/aarch64/xlat_tables.c \
+PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS} \
$(MARVELL_PLAT_BASE)/common/aarch64/marvell_common.c \
$(MARVELL_PLAT_BASE)/common/aarch64/marvell_helpers.S \
$(MARVELL_COMMON_BASE)/marvell_console.c