diff options
| author | Tom Rini <[email protected]> | 2021-10-05 17:16:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-05 17:16:23 -0400 |
| commit | 7240e1b8f94a56db88a2af688cad27e2e6545302 (patch) | |
| tree | 00e07de1f4b83cf96f183b881e80cd273dabd892 /include/tee | |
| parent | 50c84208ad50a27382c64af911abba4510a8b608 (diff) | |
| parent | c3ef4550a2c439e9726205769d4381ed7e7fbc3d (diff) | |
Merge branch '2021-10-05-general-updates'
- Assorted OPTEE cleanups
- pinctrl, gpio improvements, assorted livetree migrations
- Assorted pytest improvements
Diffstat (limited to 'include/tee')
| -rw-r--r-- | include/tee/optee.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/include/tee/optee.h b/include/tee/optee.h index ebdfe5e98d7..5412bc7386e 100644 --- a/include/tee/optee.h +++ b/include/tee/optee.h @@ -43,21 +43,7 @@ optee_image_get_load_addr(const struct image_header *hdr) return optee_image_get_entry_point(hdr) - sizeof(struct optee_header); } -#if defined(CONFIG_OPTEE) -int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start, - unsigned long tzdram_len, unsigned long image_len); -#else -static inline int optee_verify_image(struct optee_header *hdr, - unsigned long tzdram_start, - unsigned long tzdram_len, - unsigned long image_len) -{ - return -EPERM; -} - -#endif - -#if defined(CONFIG_OPTEE) +#if defined(CONFIG_OPTEE_IMAGE) int optee_verify_bootm_image(unsigned long image_addr, unsigned long image_load_addr, unsigned long image_len); @@ -70,7 +56,7 @@ static inline int optee_verify_bootm_image(unsigned long image_addr, } #endif -#if defined(CONFIG_OPTEE) && defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OPTEE_LIB) && defined(CONFIG_OF_LIBFDT) int optee_copy_fdt_nodes(void *new_blob); #else static inline int optee_copy_fdt_nodes(void *new_blob) |