feat(versal): switch to xlat_v2

Switch to v2 version to add support for dynamic mapping which is not
supported in v1. It can be used for run time DT mapping.

Change-Id: I3f27591caf944dc758cc45ee870b9b5b3ff0a18d
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/plat/xilinx/versal/aarch64/versal_common.c b/plat/xilinx/versal/aarch64/versal_common.c
index ed7f270035c1087d375fabe7e1d3a878888dbee1..1346081c7b88b14e880e7f691e57a8c98c0e4b45 100644 (file)
--- a/plat/xilinx/versal/aarch64/versal_common.c
+++ b/plat/xilinx/versal/aarch64/versal_common.c
@@ -11,7 +11,7 @@
 #include <common/debug.h>
 #include <drivers/generic_delay_timer.h>
 #include <lib/mmio.h>
-#include <lib/xlat_tables/xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <plat/common/platform.h>
 
 /*

diff --git a/plat/xilinx/versal/bl31_versal_setup.c b/plat/xilinx/versal/bl31_versal_setup.c
index 77561a7708ece8f31523db906e435cba91f5a5eb..9154ec25ee0cb0a692786ab65ee817410b3cd0e5 100644 (file)
--- a/plat/xilinx/versal/bl31_versal_setup.c
+++ b/plat/xilinx/versal/bl31_versal_setup.c
@@ -17,7 +17,7 @@
 #include <drivers/arm/pl011.h>
 #include <drivers/console.h>
 #include <lib/mmio.h>
-#include <lib/xlat_tables/xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <plat/common/platform.h>
 #include <versal_def.h>
 #include <plat_private.h>
@@ -229,5 +229,5 @@ void bl31_plat_arch_setup(void)
        };
 
        setup_page_tables(bl_regions, plat_versal_get_mmap());
-       enable_mmu_el3(0);
+       enable_mmu(0);
 }

diff --git a/plat/xilinx/versal/include/plat_private.h b/plat/xilinx/versal/include/plat_private.h
index 818797d2d2bc855bd4c72efeeea828b07c42b1c0..2f8c0893ad3959b58a7bc85e1bdd820947af3b6e 100644 (file)
--- a/plat/xilinx/versal/include/plat_private.h
+++ b/plat/xilinx/versal/include/plat_private.h
@@ -9,7 +9,7 @@
 #ifndef PLAT_PRIVATE_H
 #define PLAT_PRIVATE_H
 
-#include <lib/xlat_tables/xlat_tables.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <bl31/interrupt_mgmt.h>
 
 typedef struct versal_intr_info_type_el3 {

diff --git a/plat/xilinx/versal/platform.mk b/plat/xilinx/versal/platform.mk
index 71f680261bc394e3aa36cbb03940591cfd6633b5..6e3c7efb3f5ece453d33b4f868e1d930f74d740e 100644 (file)
--- a/plat/xilinx/versal/platform.mk
+++ b/plat/xilinx/versal/platform.mk
@@ -53,10 +53,9 @@ PLAT_INCLUDES                :=      -Iinclude/plat/arm/common/                      \
 
 # Include GICv3 driver files
 include drivers/arm/gic/v3/gicv3.mk
+include lib/xlat_tables_v2/xlat_tables.mk
 
-PLAT_BL_COMMON_SOURCES :=      lib/xlat_tables/xlat_tables_common.c            \
-                               lib/xlat_tables/aarch64/xlat_tables.c           \
-                               drivers/arm/dcc/dcc_console.c                   \
+PLAT_BL_COMMON_SOURCES :=      drivers/arm/dcc/dcc_console.c                   \
                                drivers/delay_timer/delay_timer.c               \
                                drivers/delay_timer/generic_delay_timer.c       \
                                ${GICV3_SOURCES}                                \
@@ -66,7 +65,8 @@ PLAT_BL_COMMON_SOURCES        :=      lib/xlat_tables/xlat_tables_common.c            \
                                plat/arm/common/arm_common.c                    \
                                plat/common/plat_gicv3.c                        \
                                plat/xilinx/versal/aarch64/versal_helpers.S     \
-                               plat/xilinx/versal/aarch64/versal_common.c
+                               plat/xilinx/versal/aarch64/versal_common.c      \
+                               ${XLAT_TABLES_LIB_SRCS}
 
 VERSAL_CONSOLE ?=      pl011
 ifeq (${VERSAL_CONSOLE}, $(filter ${VERSAL_CONSOLE},pl011 pl011_0 pl011_1 dcc))