From c884c9a55b167383ff3d96d2d0a30ac6842bcc86 Mon Sep 17 00:00:00 2001 From: Venkatesh Yadav Abbarapu Date: Fri, 6 May 2022 14:07:15 +0530 Subject: [PATCH] fix(zynqmp): define and enable ARM_XLAT_TABLES_LIB_V1 Enable ARM_XLAT_TABLES_LIB_V1 as ZynqMP is using v1 library of translation tables. With upstream patch d323af9e3d903d981b42f954844a95a6bfef91ab, the usage of MAP_REGION_FLAT is referring to definition in file include/lib/xlat_tables/xlat_tables_v2.h but while preparing xlat tables in lib/xlat_tables/xlat_tables_common.c it is referring to include/lib/xlat_tables/xlat_tables.h which is v1 xlat tables. Also, ZynqMP was using v1 so defined ARM_XLAT_TABLES_LIB_V1 to use v1 xlat tables everywhere. This fixes the issue of xlat tables failures as it takes v2 library mmap_region structure in some files and v1 in other files. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Venkatesh Yadav Abbarapu Change-Id: Ibc0e1c536e19f4edd6a6315bf1b0dfcec33e2fdc --- plat/xilinx/zynqmp/platform.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index 620bf6c57..ea8a5d1db 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -21,6 +21,10 @@ ENABLE_SVE_FOR_NS := 0 WORKAROUND_CVE_2017_5715 := 0 +ARM_XLAT_TABLES_LIB_V1 := 1 +$(eval $(call assert_boolean,ARM_XLAT_TABLES_LIB_V1)) +$(eval $(call add_define,ARM_XLAT_TABLES_LIB_V1)) + ifdef ZYNQMP_ATF_MEM_BASE $(eval $(call add_define,ZYNQMP_ATF_MEM_BASE))