diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:33 +0200 |
| commit | 5238643cf467631e1bdd9d282706a16e63412acb (patch) | |
| tree | 50ce3d1df5d23c0b7ea578a20044f89d423b864d /include | |
| parent | a34fd3272a88101483f74a608b07db4312a64015 (diff) | |
| parent | 62260d6b6df4f4e36955279e1891e3e5a2fd8414 (diff) | |
| download | barebox-5238643cf467631e1bdd9d282706a16e63412acb.tar.gz barebox-5238643cf467631e1bdd9d282706a16e63412acb.tar.xz | |
Merge branch 'for-next/arm'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/memory_layout.h | 6 | ||||
| -rw-r--r-- | include/bootm.h | 3 | ||||
| -rw-r--r-- | include/tee/optee.h | 30 |
3 files changed, 39 insertions, 0 deletions
diff --git a/include/asm-generic/memory_layout.h b/include/asm-generic/memory_layout.h index 45e0ed8023..3f69664aa0 100644 --- a/include/asm-generic/memory_layout.h +++ b/include/asm-generic/memory_layout.h @@ -11,6 +11,12 @@ #define MALLOC_BASE CONFIG_MALLOC_BASE #endif +#ifdef CONFIG_BOOTM_OPTEE_SIZE +#define OPTEE_SIZE CONFIG_BOOTM_OPTEE_SIZE +#else +#define OPTEE_SIZE 0 +#endif + #define HEAD_TEXT_BASE MALLOC_BASE #define MALLOC_SIZE CONFIG_MALLOC_SIZE #define STACK_SIZE CONFIG_STACK_SIZE diff --git a/include/bootm.h b/include/bootm.h index fdc73f711a..5ce3318ecc 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -16,6 +16,7 @@ struct bootm_data { const char *os_file; const char *initrd_file; const char *oftree_file; + const char *tee_file; int verbose; enum bootm_verify verify; bool force; @@ -86,6 +87,8 @@ struct image_data { * it. */ void *os_header; + char *tee_file; + struct resource *tee_res; enum bootm_verify verify; int verbose; diff --git a/include/tee/optee.h b/include/tee/optee.h new file mode 100644 index 0000000000..8cfe06d889 --- /dev/null +++ b/include/tee/optee.h @@ -0,0 +1,30 @@ +/* + * OP-TEE related definitions + * + * (C) Copyright 2016 Linaro Limited + * Andrew F. Davis <andrew.davis@xxxxxxxxxx> + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _OPTEE_H +#define _OPTEE_H + +#define OPTEE_MAGIC 0x4554504f +#define OPTEE_VERSION 1 +#define OPTEE_ARCH_ARM32 0 +#define OPTEE_ARCH_ARM64 1 + +struct optee_header { + uint32_t magic; + uint8_t version; + uint8_t arch; + uint16_t flags; + uint32_t init_size; + uint32_t init_load_addr_hi; + uint32_t init_load_addr_lo; + uint32_t init_mem_usage; + uint32_t paged_size; +}; + +#endif /* _OPTEE_H */ |