aboutsummaryrefslogtreecommitdiff
path: root/bl2
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-08-21 15:28:30 +0100
committerdanh-arm <dan.handley@arm.com>2015-08-21 15:28:30 +0100
commit468f808cb8967ffe69505a67c03405f1b1dc7bc6 (patch)
tree8956592be5bf742a2a5f9d04af826ca3ec784482 /bl2
parent42ed52d24ed51f7f8384398f1dd30b65304fc36e (diff)
parentfedbc0497bb0407fc1d55430eae1938712f1afe8 (diff)
downloadtrusted-firmware-a-468f808cb8967ffe69505a67c03405f1b1dc7bc6.tar.gz
Merge pull request #368 from jcastillo-arm/jc/genfw/1126
TBB: abort boot if BL3-2 cannot be authenticated
Diffstat (limited to 'bl2')
-rw-r--r--bl2/bl2_main.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 4c19002522..71940a62cf 100644
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -238,8 +238,14 @@ void bl2_main(void)
}
e = load_bl32(bl2_to_bl31_params);
- if (e)
- WARN("Failed to load BL3-2 (%i)\n", e);
+ if (e) {
+ if (e == LOAD_AUTH_ERR) {
+ ERROR("Failed to authenticate BL3-2\n");
+ panic();
+ } else {
+ WARN("Failed to load BL3-2 (%i)\n", e);
+ }
+ }
e = load_bl33(bl2_to_bl31_params);
if (e) {