Merge pull request #769 from sandrine-bailleux-arm/sb/trusty-assert-init
Check Trusty is present during the SPD's initialization
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index 4c688ca..78a68ba 100644
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -236,7 +236,12 @@
int reg_width = GET_RW(read_ctx_reg(get_el3state_ctx(&ctx->cpu_ctx),
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);
+ assert(ep_info);
cm_el1_sysregs_context_save(NON_SECURE);