From d19c34385495bccf3b7438f997fb1e6d1ff1563e Mon Sep 17 00:00:00 2001 From: David Lin Date: Thu, 24 Jan 2019 14:15:57 -0800 Subject: 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 --- services/spd/trusty/trusty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services') diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index c9d73f0e..97419162 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); -- cgit v1.2.3