Message ID | 20170913182744.8309-1-afd@ti.com |
---|---|
State | Accepted |
Commit | a1e4bc65e174f169b4dfaa5093e8f65b5228dc44 |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot] arm: mach-omap2: Relax checks on OP-TEE location to allow pageable image | expand |
On Wednesday 13 September 2017 11:57 PM, Andrew F. Davis wrote: > From: Harinarayan Bhatta <harinarayan@ti.com> > > When the OP-TEE image is built for secure paging the load address may be > in SRAM, remove checks that prevent this. > > Signed-off-by: Harinarayan Bhatta <harinarayan@ti.com> > Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Thanks and regards, Lokesh
On Wed, Sep 13, 2017 at 01:27:44PM -0500, Andrew F. Davis wrote: > From: Harinarayan Bhatta <harinarayan@ti.com> > > When the OP-TEE image is built for secure paging the load address may be > in SRAM, remove checks that prevent this. > > Signed-off-by: Harinarayan Bhatta <harinarayan@ti.com> > Signed-off-by: Andrew F. Davis <afd@ti.com> > Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 2d54a3165e..52e1785b4a 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -305,12 +305,8 @@ int secure_tee_install(u32 addr) if ((hdr->magic != OPTEE_MAGIC) || (hdr->version != OPTEE_VERSION) || - (hdr->init_load_addr_hi != 0) || - (hdr->init_load_addr_lo < (sec_mem_start + sizeof(struct optee_header))) || - (tee_file_size > size) || - ((hdr->init_load_addr_lo + tee_file_size - 1) > - (sec_mem_start + size - 1))) { - printf("Error in TEE header. Check load address and sizes\n"); + (tee_file_size > size)) { + printf("Error in TEE header. Check firewall and TEE sizes\n"); unmap_sysmem(hdr); return CMD_RET_FAILURE; }