aboutsummaryrefslogtreecommitdiff
path: root/services/spd/trusty
diff options
context:
space:
mode:
authorDavid Lin <dtwlin@google.com>2019-01-24 14:15:57 -0800
committerDavid Lin <dtwlin@google.com>2019-01-24 14:29:44 -0800
commitd19c34385495bccf3b7438f997fb1e6d1ff1563e (patch)
tree08a51f4aede83b49ac25e28b046f9aca94812bce /services/spd/trusty
parentae478c26e53993b18af5b0a79220ad2d4bb5ea32 (diff)
downloadtrusted-firmware-a-d19c34385495bccf3b7438f997fb1e6d1ff1563e.tar.gz
spd: trusty: trusty_setup should bail on unknown image
When an unknown Trusty image is found, there's no point of still trying to register the BL32 init handler. Instead, we just should bail out of the trusty_setup() and allow the system to continue to boot. Signed-off-by: David Lin <dtwlin@google.com>
Diffstat (limited to 'services/spd/trusty')
-rw-r--r--services/spd/trusty/trusty.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index c9d73f0ebf..97419162a1 100644
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -416,7 +416,8 @@ static int32_t trusty_setup(void)
} else if (instr >> 8 == 0xd53810U || instr >> 16 == 0x9400U) {
INFO("trusty: Found 64 bit image\n");
} else {
- NOTICE("trusty: Found unknown image, 0x%x\n", instr);
+ ERROR("trusty: Found unknown image, 0x%x\n", instr);
+ return -1;
}
SET_PARAM_HEAD(ep_info, PARAM_EP, VERSION_1, SECURE | EP_ST_ENABLE);