diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-10-26 16:18:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-26 16:18:03 +0200 |
| commit | 9aabd11a424770e11dd89251960678d3e3332df6 (patch) | |
| tree | f15d1c6d4e6a0f6055d8b6b470fad942ce947db3 /include | |
| parent | 31abc7c45428398a330a3a940fe4dd7efa6c96f2 (diff) | |
| parent | 0916c38deca4a2e26720da6b1aa1e15de87f9a34 (diff) | |
| download | platform_external_arm-trusted-firmware-9aabd11a424770e11dd89251960678d3e3332df6.tar.gz platform_external_arm-trusted-firmware-9aabd11a424770e11dd89251960678d3e3332df6.tar.bz2 platform_external_arm-trusted-firmware-9aabd11a424770e11dd89251960678d3e3332df6.zip | |
Merge pull request #1647 from antonio-nino-diaz-arm/an/setup-xlat
Improvements to setup page tables code
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/bl_common.h | 5 | ||||
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables_compat.h | 11 | ||||
| -rw-r--r-- | include/plat/arm/board/common/v2m_def.h | 3 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_xlat_tables.h | 11 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 8 |
5 files changed, 18 insertions, 20 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index af598d0da..2ecf281c0 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -193,6 +193,11 @@ extern const char version_string[]; void print_entry_point_info(const entry_point_info_t *ep_info); uintptr_t page_align(uintptr_t value, unsigned dir); +struct mmap_region; + +void setup_page_tables(const struct mmap_region *bl_regions, + const struct mmap_region *plat_regions); + #endif /*__ASSEMBLY__*/ #endif /* __BL_COMMON_H__ */ diff --git a/include/lib/xlat_tables/xlat_tables_compat.h b/include/lib/xlat_tables/xlat_tables_compat.h new file mode 100644 index 000000000..4650a8c6f --- /dev/null +++ b/include/lib/xlat_tables/xlat_tables_compat.h @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#if XLAT_TABLES_LIB_V2 +#include <xlat_tables_v2.h> +#else +#include <xlat_tables.h> +#endif diff --git a/include/plat/arm/board/common/v2m_def.h b/include/plat/arm/board/common/v2m_def.h index 02c349418..4a1d43c85 100644 --- a/include/plat/arm/board/common/v2m_def.h +++ b/include/plat/arm/board/common/v2m_def.h @@ -6,8 +6,7 @@ #ifndef V2M_DEF_H #define V2M_DEF_H -#include <arm_xlat_tables.h> - +#include <xlat_tables_compat.h> /* V2M motherboard system registers & offsets */ #define V2M_SYSREGS_BASE UL(0x1c010000) diff --git a/include/plat/arm/common/arm_xlat_tables.h b/include/plat/arm/common/arm_xlat_tables.h deleted file mode 100644 index 0923ad8a1..000000000 --- a/include/plat/arm/common/arm_xlat_tables.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#if ARM_XLAT_TABLES_LIB_V1 -#include <xlat_tables.h> -#else -#include <xlat_tables_v2.h> -#endif /* ARM_XLAT_TABLES_LIB_V1 */ diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 773c3603e..bdcb14415 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -6,7 +6,6 @@ #ifndef __PLAT_ARM_H__ #define __PLAT_ARM_H__ -#include <arm_xlat_tables.h> #include <bakery_lock.h> #include <cassert.h> #include <cpu_data.h> @@ -14,6 +13,7 @@ #include <spinlock.h> #include <tzc_common.h> #include <utils_def.h> +#include <xlat_tables_compat.h> /******************************************************************************* * Forward declarations @@ -66,12 +66,6 @@ typedef struct arm_tzc_regions_info { <= MAX_MMAP_REGIONS, \ assert_max_mmap_regions); -/* - * Utility functions common to ARM standard platforms - */ -void arm_setup_page_tables(const mmap_region_t bl_regions[], - const mmap_region_t plat_regions[]); - void arm_setup_romlib(void); #if defined(IMAGE_BL31) || (defined(AARCH32) && defined(IMAGE_BL32)) |