diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-14 14:33:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 14:33:13 +0100 |
| commit | 59c4346383407dad6b7573fccb7af85a97a5df3e (patch) | |
| tree | 2bdfb5a1804540fc592d9465ead8e36655511ce6 /include | |
| parent | f3a5e3d6ec20da13619d57a523d5e87a3ed3d3e2 (diff) | |
| parent | d801a1d035e8868fc2b131653c5fd96ceed10a21 (diff) | |
| download | platform_external_arm-trusted-firmware-59c4346383407dad6b7573fccb7af85a97a5df3e.tar.gz platform_external_arm-trusted-firmware-59c4346383407dad6b7573fccb7af85a97a5df3e.tar.bz2 platform_external_arm-trusted-firmware-59c4346383407dad6b7573fccb7af85a97a5df3e.zip | |
Merge pull request #1415 from antonio-nino-diaz-arm/an/spm-fixes
Minor fixes to SPM
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/xlat_tables/xlat_mmu_helpers.h | 5 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 8 | ||||
| -rw-r--r-- | include/services/secure_partition.h | 9 |
3 files changed, 6 insertions, 16 deletions
diff --git a/include/lib/xlat_tables/xlat_mmu_helpers.h b/include/lib/xlat_tables/xlat_mmu_helpers.h index d83d7640f..779531770 100644 --- a/include/lib/xlat_tables/xlat_mmu_helpers.h +++ b/include/lib/xlat_tables/xlat_mmu_helpers.h @@ -43,6 +43,8 @@ #ifndef __ASSEMBLY__ +#include <sys/types.h> + #ifdef AARCH32 /* AArch32 specific translation table API */ void enable_mmu_secure(unsigned int flags); @@ -52,6 +54,9 @@ void enable_mmu_el1(unsigned int flags); void enable_mmu_el3(unsigned int flags); #endif /* AARCH32 */ +int xlat_arch_is_granule_size_supported(size_t size); +size_t xlat_arch_get_max_supported_granule_size(void); + #endif /* __ASSEMBLY__ */ #endif /* __XLAT_MMU_HELPERS_H__ */ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index d87fc16fe..e07156c00 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -245,13 +245,7 @@ * The number of regions like RO(code), coherent and data required by * different BL stages which need to be mapped in the MMU. */ -#if ENABLE_SPM && defined(IMAGE_BL31) -# if USE_COHERENT_MEM -# define ARM_BL_REGIONS 5 -# else -# define ARM_BL_REGIONS 4 -# endif -#elif USE_COHERENT_MEM +#if USE_COHERENT_MEM # define ARM_BL_REGIONS 4 #else # define ARM_BL_REGIONS 3 diff --git a/include/services/secure_partition.h b/include/services/secure_partition.h index f1fdb733f..d4aff1cc0 100644 --- a/include/services/secure_partition.h +++ b/include/services/secure_partition.h @@ -7,18 +7,9 @@ #ifndef __SECURE_PARTITION_H__ #define __SECURE_PARTITION_H__ -#include <bl_common.h> #include <types.h> #include <utils_def.h> -/* Import linker symbols */ -IMPORT_SYM(uintptr_t, __SP_IMAGE_XLAT_TABLES_START__, SP_IMAGE_XLAT_TABLES_START); -IMPORT_SYM(uintptr_t, __SP_IMAGE_XLAT_TABLES_END__, SP_IMAGE_XLAT_TABLES_END); - -/* Definitions */ -#define SP_IMAGE_XLAT_TABLES_SIZE \ - (SP_IMAGE_XLAT_TABLES_END - SP_IMAGE_XLAT_TABLES_START) - /* * Flags used by the secure_partition_mp_info structure to describe the * characteristics of a cpu. Only a single flag is defined at the moment to |