diff options
| author | danh-arm <dan.handley@arm.com> | 2017-08-29 11:51:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 11:51:32 +0100 |
| commit | 48f4bcd2ec9eeec58ff06e8b96094e0b0544ef5e (patch) | |
| tree | 763ee5dcb4831149415026f5703ad3ae59413ee3 | |
| parent | 913c38424ed3c68558bdb90c94e6c895870e71c7 (diff) | |
| parent | 810d9213b8bf143d04f4507770a1241abd5d9332 (diff) | |
| download | platform_external_arm-trusted-firmware-48f4bcd2ec9eeec58ff06e8b96094e0b0544ef5e.tar.gz platform_external_arm-trusted-firmware-48f4bcd2ec9eeec58ff06e8b96094e0b0544ef5e.tar.bz2 platform_external_arm-trusted-firmware-48f4bcd2ec9eeec58ff06e8b96094e0b0544ef5e.zip | |
Merge pull request #1068 from jenswi-linaro/optee_arm_plat
Optee arm platform common
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 20 | ||||
| -rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 3 |
2 files changed, 14 insertions, 9 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 55747bf4a..106cd747f 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -97,16 +97,18 @@ #ifdef SPD_opteed /* - * BL2 needs to map 3.5MB from 512KB offset in TZC_DRAM1 in order to - * load/authenticate the trusted os extra image. The first 512KB of TZC_DRAM1 - * are reserved for trusted os (OPTEE). The extra image loading for OPTEE is - * paged image which only include the paging part using virtual memory but - * without "init" data. OPTEE will copy the "init" data (from pager image) to - * the first 512KB of TZC_DRAM, and then copy the extra image behind the "init" - * data. + * BL2 needs to map 4MB at the end of TZC_DRAM1 in order to + * load/authenticate the trusted os extra image. The first 512KB of + * TZC_DRAM1 are reserved for trusted os (OPTEE). The extra image loading + * for OPTEE is paged image which only include the paging part using + * virtual memory but without "init" data. OPTEE will copy the "init" data + * (from pager image) to the first 512KB of TZC_DRAM, and then copy the + * extra image behind the "init" data. */ -#define ARM_OPTEE_PAGEABLE_LOAD_BASE (ARM_AP_TZC_DRAM1_BASE + 0x80000) -#define ARM_OPTEE_PAGEABLE_LOAD_SIZE 0x380000 +#define ARM_OPTEE_PAGEABLE_LOAD_BASE (ARM_AP_TZC_DRAM1_BASE + \ + ARM_AP_TZC_DRAM1_SIZE - \ + ARM_OPTEE_PAGEABLE_LOAD_SIZE) +#define ARM_OPTEE_PAGEABLE_LOAD_SIZE 0x400000 #define ARM_OPTEE_PAGEABLE_LOAD_MEM MAP_REGION_FLAT( \ ARM_OPTEE_PAGEABLE_LOAD_BASE, \ ARM_OPTEE_PAGEABLE_LOAD_SIZE, \ diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index d6b9820ce..d97a04920 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -87,6 +87,9 @@ const mmap_region_t plat_arm_mmap[] = { #if ARM_BL31_IN_DRAM ARM_MAP_BL31_SEC_DRAM, #endif +#ifdef SPD_opteed + ARM_OPTEE_PAGEABLE_LOAD_MEM, +#endif {0} }; #endif |