plat/synquacer: enable OP-TEE logic only if SPD_opteed is set

The logic that initializes the BL32 entry point data structure
should only be executed if we are in fact loading OP-TEE, and
not if BL32_BASE is set for other reasons (i.e., when enabling
SPM)

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
Ard Biesheuvel 2018-12-29 19:40:31 +01:00
parent 32e8353748
commit e373b6a28c
3 changed files with 4 additions and 6 deletions

View File

@ -38,6 +38,8 @@
#define BL31_SIZE 0x00080000
#define BL31_LIMIT (BL31_BASE + BL31_SIZE)
#define BL32_BASE 0xfc000000
#define PLAT_SQ_CCN_BASE 0x32000000
#define PLAT_SQ_CLUSTER_TO_CCN_ID_MAP \
0, /* Cluster 0 */ \

View File

@ -17,10 +17,6 @@ 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 \

View File

@ -76,7 +76,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
/* Initialize power controller before setting up topology */
plat_sq_pwrc_setup();
#ifdef BL32_BASE
#ifdef SPD_opteed
struct draminfo di = {0};
scpi_get_draminfo(&di);
@ -98,7 +98,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
} else {
NOTICE("OP-TEE has not been loaded by SCP firmware\n");
}
#endif /* BL32_BASE */
#endif /* SPD_opteed */
/* Populate entry point information for BL33 */
SET_PARAM_HEAD(&bl33_image_ep_info,