Merge pull request #1781 from dtwlin/m2

spd: trusty: trusty_setup should bail on unknown image

Merge pull request #1781 from dtwlin/m2
spd: trusty: trusty_setup should bail on unknown image
a1d1d24b · Antonio Niño Díaz · GitHub · 72106f82 · d19c3438 · a1d1d24b
Unverified Commit a1d1d24b authored 6 years ago by Antonio Niño Díaz Committed by GitHub 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -420,7 +420,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);