diff options
| author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2018-03-13 16:50:27 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-19 16:14:23 -0400 |
| commit | 32ce6179fb99544fa9d7348e4641ccdf6c1e6067 (patch) | |
| tree | 20e3729866df4646bbfeaa109e2ad67ee3663e10 /lib/optee | |
| parent | 5cf32518eaaa49d12584fc86777e30f8b91db7ad (diff) | |
| download | u-boot-32ce6179fb99544fa9d7348e4641ccdf6c1e6067.tar.gz u-boot-32ce6179fb99544fa9d7348e4641ccdf6c1e6067.tar.bz2 u-boot-32ce6179fb99544fa9d7348e4641ccdf6c1e6067.zip | |
optee: Add lib entries for sharing OPTEE code across ports
This patch adds code to lib to enable sharing of useful OPTEE code between
board-ports and architectures. The code on lib/optee/optee.c comes from the
TI omap2 port. Eventually the OMAP2 code will be patched to include the
shared code. The intention here is to add more useful OPTEE specific code
as more functionality gets added.
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>
Diffstat (limited to 'lib/optee')
| -rw-r--r-- | lib/optee/Kconfig | 8 | ||||
| -rw-r--r-- | lib/optee/Makefile | 7 | ||||
| -rw-r--r-- | lib/optee/optee.c | 31 |
3 files changed, 46 insertions, 0 deletions
diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig new file mode 100644 index 0000000000..2e406fe107 --- /dev/null +++ b/lib/optee/Kconfig @@ -0,0 +1,8 @@ +config OPTEE + bool "Support OPTEE images" + help + U-Boot can be configured to boot OPTEE images. + Selecting this option will enable shared OPTEE library code and + enable an OPTEE specific bootm command that will perform additional + OPTEE specific checks before booting an OPTEE image created with + mkimage. diff --git a/lib/optee/Makefile b/lib/optee/Makefile new file mode 100644 index 0000000000..03e832f349 --- /dev/null +++ b/lib/optee/Makefile @@ -0,0 +1,7 @@ +# +# (C) Copyright 2017 Linaro +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-$(CONFIG_OPTEE) += optee.o diff --git a/lib/optee/optee.c b/lib/optee/optee.c new file mode 100644 index 0000000000..2cc16d7c97 --- /dev/null +++ b/lib/optee/optee.c @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2017 Linaro + * Bryan O'Donoghue <bryan.odonoghue@linaro.org> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <tee/optee.h> + +int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start, + unsigned long tzdram_len, unsigned long image_len) +{ + unsigned long tzdram_end = tzdram_start + tzdram_len; + uint32_t tee_file_size; + + tee_file_size = hdr->init_size + hdr->paged_size + + sizeof(struct optee_header); + + if (hdr->magic != OPTEE_MAGIC || + hdr->version != OPTEE_VERSION || + hdr->init_load_addr_hi > tzdram_end || + hdr->init_load_addr_lo < tzdram_start || + tee_file_size > tzdram_len || + tee_file_size != image_len || + (hdr->init_load_addr_lo + tee_file_size) > tzdram_end) { + return -EINVAL; + } + + return 0; +} |