andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1068 from jenswi-linaro/optee_arm_plat 

Optee arm platform common
This commit is contained in:
danh-arm 2017-08-29 11:51:32 +01:00 committed by GitHub
parent 913c38424e 810d9213b8
commit 48f4bcd2ec
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/plat/arm/common/arm_def.h
View File

@ -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, \

3
plat/arm/board/fvp/fvp_common.c
View File

@ -86,6 +86,9 @@ const mmap_region_t plat_arm_mmap[] = {
#endif
#if ARM_BL31_IN_DRAM
ARM_MAP_BL31_SEC_DRAM,
#endif
#ifdef SPD_opteed
ARM_OPTEE_PAGEABLE_LOAD_MEM,
#endif
{0}
};