Commit bc8f9b84 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #769 from sandrine-bailleux-arm/sb/trusty-assert-init

Check Trusty is present during the SPD's initialization
parents c59428b1 e97e413f
...@@ -236,7 +236,12 @@ static int32_t trusty_init(void) ...@@ -236,7 +236,12 @@ static int32_t trusty_init(void)
int reg_width = GET_RW(read_ctx_reg(get_el3state_ctx(&ctx->cpu_ctx), int reg_width = GET_RW(read_ctx_reg(get_el3state_ctx(&ctx->cpu_ctx),
CTX_SPSR_EL3)); CTX_SPSR_EL3));
/*
* Get information about the Trusty image. Its absence is a critical
* failure.
*/
ep_info = bl31_plat_get_next_image_ep_info(SECURE); ep_info = bl31_plat_get_next_image_ep_info(SECURE);
assert(ep_info);
cm_el1_sysregs_context_save(NON_SECURE); cm_el1_sysregs_context_save(NON_SECURE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment