[8/9] optee: Improve error printout

Message ID 1515768744-25246-9-git-send-email-bryan.odonoghue@linaro.org
State New
Headers show
  • Add new OPTEE bootm support to u-boot
Related show

Commit Message

Bryan O'Donoghue Jan. 12, 2018, 2:52 p.m.
When encountering an error in OPTEE verification print out the address of
the header and image.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Harinarayan Bhatta <harinarayan@ti.com>
Cc: Andrew F. Davis <afd@ti.com>
Cc: Tom Rini <trini@konsulko.com>
Cc: Kever Yang <kever.yang@rock-chips.com>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Cc: Peng Fan <peng.fan@nxp.com>
 lib/optee/optee.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 36358f1..8c4e7fe 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -56,10 +56,12 @@  int optee_verify_bootm_image(unsigned long image_addr,
 	return ret;
-	printf("OPTEE verification error tzdram 0x%08lx-0x%08lx "
-	       "header 0x%08x-0x%08x size=0x%08lx arch=0x%08x"
-	       "uimage params 0x%08lx-0x%08lx\n",
-	       tzdram_start, tzdram_start + tzdram_len, hdr->init_load_addr_lo,
+	printf("OPTEE verification error:"
+	       "\n\thdr=%p image=0x%08lx magic=0x%08x tzdram 0x%08lx-0x%08lx "
+	       "\n\theader lo=0x%08x hi=0x%08x size=0x%08lx arch=0x%08x"
+	       "\n\tuimage params 0x%08lx-0x%08lx\n",
+	       hdr, image_addr, hdr->magic, tzdram_start,
+	       tzdram_start + tzdram_len, hdr->init_load_addr_lo,
 	       hdr->init_load_addr_hi, image_len, hdr->arch, image_load_addr,
 	       image_load_addr + image_len);