diff options
| -rw-r--r-- | include/plat/arm/board/common/v2m_def.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/soc/common/soc_css_def.h | 1 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl1_setup.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/arm_common.c | 4 | ||||
| -rw-r--r-- | plat/arm/common/arm_common.mk | 5 |
7 files changed, 12 insertions, 12 deletions
diff --git a/include/plat/arm/board/common/v2m_def.h b/include/plat/arm/board/common/v2m_def.h index 7cee4e8f..aaa96f30 100644 --- a/include/plat/arm/board/common/v2m_def.h +++ b/include/plat/arm/board/common/v2m_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -30,7 +30,7 @@ #ifndef __V2M_DEF_H__ #define __V2M_DEF_H__ -#include <xlat_tables.h> +#include <xlat_tables_v2.h> /* V2M motherboard system registers & offsets */ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 4d264448..8ce718af 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -34,7 +34,7 @@ #include <common_def.h> #include <platform_def.h> #include <tbbr_img_def.h> -#include <xlat_tables.h> +#include <xlat_tables_defs.h> /****************************************************************************** diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index e878f9eb..697b9170 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -35,7 +35,7 @@ #include <cpu_data.h> #include <stdint.h> #include <utils.h> -#include <xlat_tables.h> +#include <xlat_tables_v2.h> /******************************************************************************* * Forward declarations diff --git a/include/plat/arm/soc/common/soc_css_def.h b/include/plat/arm/soc/common/soc_css_def.h index 316f8f90..e83144ec 100644 --- a/include/plat/arm/soc/common/soc_css_def.h +++ b/include/plat/arm/soc/common/soc_css_def.h @@ -32,7 +32,6 @@ #define __SOC_CSS_DEF_H__ #include <common_def.h> -#include <xlat_tables.h> /* diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index 81a87c44..8c1fde43 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -36,7 +36,7 @@ #include <plat_arm.h> #include <sp805.h> #include <utils.h> -#include <xlat_tables.h> +#include <xlat_tables_v2.h> #include "../../../bl1/bl1_private.h" /* Weak definitions may be overridden in specific ARM standard platform */ diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index c53723d5..aade2212 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -34,7 +34,7 @@ #include <mmio.h> #include <plat_arm.h> #include <platform_def.h> -#include <xlat_tables.h> +#include <xlat_tables_v2.h> extern const mmap_region_t plat_arm_mmap[]; diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 4628a43d..3156f085 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -108,8 +108,9 @@ ifeq (${ARCH}, aarch64) PLAT_INCLUDES += -Iinclude/plat/arm/common/aarch64 endif -PLAT_BL_COMMON_SOURCES += lib/xlat_tables/xlat_tables_common.c \ - lib/xlat_tables/${ARCH}/xlat_tables.c \ +include lib/xlat_tables_v2/xlat_tables.mk + +PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS} \ plat/arm/common/${ARCH}/arm_helpers.S \ plat/arm/common/arm_common.c \ plat/common/${ARCH}/plat_common.c |