diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-19 16:52:22 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-26 14:55:30 +0100 |
| commit | 03987d01e9effe2b896e1ddb16894238d37e099a (patch) | |
| tree | e5a80d3876bad5e9e8e038f318cce4fa6b55c7e1 /plat/arm | |
| parent | 31abc7c45428398a330a3a940fe4dd7efa6c96f2 (diff) | |
| download | platform_external_arm-trusted-firmware-03987d01e9effe2b896e1ddb16894238d37e099a.tar.gz platform_external_arm-trusted-firmware-03987d01e9effe2b896e1ddb16894238d37e099a.tar.bz2 platform_external_arm-trusted-firmware-03987d01e9effe2b896e1ddb16894238d37e099a.zip | |
xlat: Fix compatibility between v1 and v2
There are several platforms using arm_setup_page_tables(), which is
supposed to be Arm platform only. This creates several dependency
problems between platforms.
This patch adds the definition XLAT_TABLES_LIB_V2 to the xlat tables lib
v2 makefile. This way it is possible to detect from C code which version
is being used and include the correct header.
The file arm_xlat_tables.h has been renamed to xlat_tables_compat.h and
moved to a common folder. This way, when in doubt, this header can be
used to guarantee compatibility, as it includes the correct header based
on XLAT_TABLES_LIB_V2.
This patch also removes the usage of ARM_XLAT_TABLES_V1 from QEMU (so
that is now locked in xlat lib v2) and ZynqMP (where it was added as a
workaround).
Change-Id: Ie1e22a23b44c549603d1402a237a70d0120d3e04
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 3 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 3 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl31_setup.c | 2 | ||||
| -rw-r--r-- | plat/arm/common/arm_common.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index aa4f8398d..836fd93f3 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -7,7 +7,6 @@ #include <arm_config.h> #include <arm_def.h> #include <arm_spm_def.h> -#include <arm_xlat_tables.h> #include <assert.h> #include <cci.h> #include <ccn.h> @@ -18,6 +17,8 @@ #include <platform.h> #include <secure_partition.h> #include <v2m_def.h> +#include <xlat_tables_compat.h> + #include "../fvp_def.h" #include "fvp_private.h" diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index 717e96f85..d67c0c275 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -6,7 +6,6 @@ #include <arch.h> #include <arm_def.h> -#include <arm_xlat_tables.h> #include <assert.h> #include <bl1.h> #include <bl_common.h> @@ -15,6 +14,8 @@ #include <platform_def.h> #include <sp805.h> #include <utils.h> +#include <xlat_tables_compat.h> + #include "../../../bl1/bl1_private.h" /* Weak definitions may be overridden in specific ARM standard platform */ diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index e218c2f05..059c9d50d 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -16,7 +16,7 @@ #include <platform.h> #include <ras.h> #include <utils.h> -#include <arm_xlat_tables.h> +#include <xlat_tables_compat.h> /* * Placeholder variables for copying the arguments that have been passed to diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index a21d189e9..243159c77 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -5,7 +5,6 @@ */ #include <arch.h> #include <arch_helpers.h> -#include <arm_xlat_tables.h> #include <assert.h> #include <debug.h> #include <mmio.h> @@ -14,6 +13,7 @@ #include <platform_def.h> #include <romlib.h> #include <secure_partition.h> +#include <xlat_tables_compat.h> /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak plat_get_ns_image_entrypoint |