diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:45 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:45 +0100 |
| commit | 801119922cb086ea7fc9f9194253a180d40581cb (patch) | |
| tree | db40f3a353c683ef16b771f11450e689fab32393 /include | |
| parent | d69b7f3d693887c755671bffab677362f4e4a0b6 (diff) | |
| parent | af1a0da42f9493b2d4266580b15d52946b326ca7 (diff) | |
| download | barebox-801119922cb086ea7fc9f9194253a180d40581cb.tar.gz barebox-801119922cb086ea7fc9f9194253a180d40581cb.tar.xz | |
Merge branch 'for-next/optee'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/memory_layout.h | 4 | ||||
| -rw-r--r-- | include/tee/optee.h | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/asm-generic/memory_layout.h b/include/asm-generic/memory_layout.h index 3f69664aa0..0d7ce3fe02 100644 --- a/include/asm-generic/memory_layout.h +++ b/include/asm-generic/memory_layout.h @@ -11,8 +11,8 @@ #define MALLOC_BASE CONFIG_MALLOC_BASE #endif -#ifdef CONFIG_BOOTM_OPTEE_SIZE -#define OPTEE_SIZE CONFIG_BOOTM_OPTEE_SIZE +#ifdef CONFIG_OPTEE_SIZE +#define OPTEE_SIZE CONFIG_OPTEE_SIZE #else #define OPTEE_SIZE 0 #endif diff --git a/include/tee/optee.h b/include/tee/optee.h index 8cfe06d889..fa124236ba 100644 --- a/include/tee/optee.h +++ b/include/tee/optee.h @@ -10,6 +10,9 @@ #ifndef _OPTEE_H #define _OPTEE_H +#include <types.h> +#include <asm-generic/errno.h> + #define OPTEE_MAGIC 0x4554504f #define OPTEE_VERSION 1 #define OPTEE_ARCH_ARM32 0 @@ -27,4 +30,12 @@ struct optee_header { uint32_t paged_size; }; +int optee_verify_header (struct optee_header *hdr); + +#ifdef __PBL__ + +int start_optee_early(void* fdt, void* tee); + +#endif /* __PBL__ */ + #endif /* _OPTEE_H */ |