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

Merge pull request #1488 from b49020/integration 

synquacer: Enable optional OP-TEE support
This commit is contained in:
danh-arm 2018-07-24 14:37:23 +01:00 committed by GitHub
parent 790e6c5b96 6cb2a39703
commit cffb003428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plat/socionext/synquacer/platform.mk
View File

@ -18,6 +18,10 @@ ERRATA_A53_855873 := 1
# Libraries
include lib/xlat_tables_v2/xlat_tables.mk
ifeq (${SPD},opteed)
TF_CFLAGS_aarch64 += -DBL32_BASE=0xfc000000
endif
PLAT_PATH := plat/socionext/synquacer
PLAT_INCLUDES := -I$(PLAT_PATH)/include \
-I$(PLAT_PATH)/drivers/scpi \

35
plat/socionext/synquacer/sq_bl31_setup.c
View File

@ -70,15 +70,31 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
assert(from_bl2 == NULL);
assert(plat_params_from_bl2 == NULL);
/* Initialize power controller before setting up topology */
plat_sq_pwrc_setup();
#ifdef BL32_BASE
/* Populate entry point information for BL32 */
SET_PARAM_HEAD(&bl32_image_ep_info,
PARAM_EP,
VERSION_1,
0);
SET_SECURITY_STATE(bl32_image_ep_info.h.attr, SECURE);
bl32_image_ep_info.pc = BL32_BASE;
bl32_image_ep_info.spsr = sq_get_spsr_for_bl32_entry();
struct draminfo di = {0};
scpi_get_draminfo(&di);
/*
* Check if OP-TEE has been loaded in Secure RAM allocated
* from DRAM1 region
*/
if ((di.base1 + di.size1) <= BL32_BASE) {
NOTICE("OP-TEE has been loaded by SCP firmware\n");
/* Populate entry point information for BL32 */
SET_PARAM_HEAD(&bl32_image_ep_info,
PARAM_EP,
VERSION_1,
0);
SET_SECURITY_STATE(bl32_image_ep_info.h.attr, SECURE);
bl32_image_ep_info.pc = BL32_BASE;
bl32_image_ep_info.spsr = sq_get_spsr_for_bl32_entry();
} else {
NOTICE("OP-TEE has not been loaded by SCP firmware\n");
}
#endif /* BL32_BASE */
/* Populate entry point information for BL33 */
@ -125,9 +141,6 @@ void bl31_platform_setup(void)
/* Allow access to the System counter timer module */
sq_configure_sys_timer();
/* Initialize power controller before setting up topology */
plat_sq_pwrc_setup();
}
void bl31_plat_runtime_setup(void)