Commit 74ad948f authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

BL31: Fix warning about BL32 init function



The expected value for failure is 0, so the warning only has to be shown
in that case. This is the way the TSPD has done it since it was
introduced, and the way SPM and OP-TEE do it.

Trusty wrongly returns 0 on success.

In the case of TLK, the return value of tlkd_init() is passed from the
secure world in register X1 when calling the SMC TLK_ENTRY_DONE.

Change-Id: I39106d67631ee57f109619f8830bf4b9d96155e6
Signed-off-by: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent e52ed092
...@@ -108,10 +108,8 @@ void bl31_main(void) ...@@ -108,10 +108,8 @@ void bl31_main(void)
int32_t rc = (*bl32_init)(); int32_t rc = (*bl32_init)();
if (rc != 0) { if (rc == 0)
WARN("BL31: BL32 initialization failed (rc = %d)\n", WARN("BL31: BL32 initialization failed\n");
rc);
}
} }
/* /*
* We are ready to enter the next EL. Prepare entry into the image * We are ready to enter the next EL. Prepare entry into the image
......
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