On 01/19/2018 01:43 PM, Bryan O'Donoghue wrote:
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 Tested-by: Peng Fan peng.fan@nxp.com
lib/optee/optee.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/optee/optee.c b/lib/optee/optee.c index e28627d..78a15e8 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -8,9 +8,11 @@ #include <common.h> #include <tee/optee.h>
-#define optee_hdr_err_msg "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"+#define optee_hdr_err_msg \
- "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"
int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start, unsigned long tzdram_len, unsigned long image_len) @@ -55,9 +57,10 @@ int optee_verify_bootm_image(unsigned long image_addr,
return ret; error:
- printf(optee_hdr_err_msg, 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);
- printf(optee_hdr_err_msg, 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);
This all can be squashed up into the patches that introduce all this stuff.
return ret; }