diff options
| author | Harinarayan Bhatta <harinarayan@ti.com> | 2017-09-13 13:27:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-15 09:03:16 -0400 |
| commit | a1e4bc65e174f169b4dfaa5093e8f65b5228dc44 (patch) | |
| tree | ef240209429375c6f8bb0756dba0fe7e2c718965 /arch/arm/mach-omap2 | |
| parent | 725ffdb5cbcc4b8a9726a68cc6ae0713266ba5a9 (diff) | |
arm: mach-omap2: Relax checks on OP-TEE location to allow pageable image
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>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/sec-common.c | 8 |
1 files changed, 2 insertions, 6 deletions
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; } |