aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>2018-09-18 13:10:47 +0100
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>2018-09-18 13:14:30 +0100
commit74ad948f43942409c29c600deaa9dd87997f1d0e (patch)
tree8dec60896a4cff0b1bbf00e834d87a970260bd48 /bl31
parente52ed092cde21d13533df32eb68629a980d69b4b (diff)
downloadtrusted-firmware-a-74ad948f43942409c29c600deaa9dd87997f1d0e.tar.gz
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: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'bl31')
-rw-r--r--bl31/bl31_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 5479a49865..4b7f63c210 100644
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -108,10 +108,8 @@ void bl31_main(void)
int32_t rc = (*bl32_init)();
- if (rc != 0) {
- WARN("BL31: BL32 initialization failed (rc = %d)\n",
- rc);
- }
+ if (rc == 0)
+ WARN("BL31: BL32 initialization failed\n");
}
/*
* We are ready to enter the next EL. Prepare entry into the image