diff options
-rw-r--r-- | bl31/bl31.ld.S | 7 | ||||
-rw-r--r-- | include/plat/arm/common/arm_def.h | 8 | ||||
-rw-r--r-- | include/services/secure_partition.h | 9 | ||||
-rw-r--r-- | plat/arm/common/arm_common.c | 8 |
4 files changed, 1 insertions, 31 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index c6a4fe4993..59df9b80e2 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -221,13 +221,6 @@ SECTIONS * tables library. */ xlat_table (NOLOAD) : { -#if ENABLE_SPM - __SP_IMAGE_XLAT_TABLES_START__ = .; - *secure_partition*.o(xlat_table) - /* Make sure that the rest of the page is empty. */ - . = NEXT(PAGE_SIZE); - __SP_IMAGE_XLAT_TABLES_END__ = .; -#endif *(xlat_table) } >RAM diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index d87fc16fe7..e07156c001 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 f1fdb733f8..d4aff1cc08 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 diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index 3f0ea01a1b..11bdeac66e 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -81,14 +81,6 @@ void arm_setup_page_tables(uintptr_t total_base, MT_DEVICE | MT_RW | MT_SECURE); #endif -#if ENABLE_SPM && defined(IMAGE_BL31) - /* The address of the following region is calculated by the linker. */ - mmap_add_region(SP_IMAGE_XLAT_TABLES_START, - SP_IMAGE_XLAT_TABLES_START, - SP_IMAGE_XLAT_TABLES_SIZE, - MT_MEMORY | MT_RW | MT_SECURE); -#endif - /* Now (re-)map the platform-specific memory regions */ mmap_add(plat_arm_get_mmap()); |