diff options
| author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:40:01 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-18 17:33:33 -0400 |
| commit | 4d72caa5b96b71e49b63f98bd8548b194380b544 (patch) | |
| tree | 8e636424599794d122342437e21fb601a7c62180 /include | |
| parent | 52f24238046ca28085f6de946d0358e5c7c7cbe8 (diff) | |
| download | u-boot-4d72caa5b96b71e49b63f98bd8548b194380b544.zip u-boot-4d72caa5b96b71e49b63f98bd8548b194380b544.tar.gz u-boot-4d72caa5b96b71e49b63f98bd8548b194380b544.tar.bz2 | |
common: Drop image.h from common header
Move this uncommon header out of the common header.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/u-boot.h | 1 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/tee/optee.h | 7 | ||||
| -rw-r--r-- | include/vxworks.h | 6 |
4 files changed, 10 insertions, 5 deletions
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index cc94d39..6f74973 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -23,6 +23,7 @@ #ifndef __ASSEMBLY__ +#include <asm/types.h> #include <linux/types.h> typedef struct bd_info { diff --git a/include/common.h b/include/common.h index fd3e2de..a87c062 100644 --- a/include/common.h +++ b/include/common.h @@ -28,7 +28,6 @@ #include <stdarg.h> #include <stdio.h> #include <linux/kernel.h> -#include <image.h> #include <log.h> #include <asm/u-boot.h> /* boot information for Linux kernel */ #include <asm/global_data.h> /* global data used for startup functions */ diff --git a/include/tee/optee.h b/include/tee/optee.h index 121b30a..affa937 100644 --- a/include/tee/optee.h +++ b/include/tee/optee.h @@ -10,6 +10,7 @@ #define _OPTEE_H #include <linux/errno.h> +#include <image.h> #define OPTEE_MAGIC 0x4554504f #define OPTEE_VERSION 1 @@ -28,14 +29,16 @@ struct optee_header { uint32_t paged_size; }; -static inline uint32_t optee_image_get_entry_point(const image_header_t *hdr) +static inline uint32_t +optee_image_get_entry_point(const struct image_header *hdr) { struct optee_header *optee_hdr = (struct optee_header *)(hdr + 1); return optee_hdr->init_load_addr_lo; } -static inline uint32_t optee_image_get_load_addr(const image_header_t *hdr) +static inline uint32_t +optee_image_get_load_addr(const struct image_header *hdr) { return optee_image_get_entry_point(hdr) - sizeof(struct optee_header); } diff --git a/include/vxworks.h b/include/vxworks.h index d90d862..10c5e11 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -9,6 +9,8 @@ #include <efi_api.h> +struct bootm_headers; + /* Use Linux compatible standard DTB */ #define VXWORKS_SYSFLG_STD_DTB 0x1 @@ -84,7 +86,7 @@ struct efi_gop_info { }; int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); -void boot_prep_vxworks(bootm_headers_t *images); -void boot_jump_vxworks(bootm_headers_t *images); +void boot_prep_vxworks(struct bootm_headers *images); +void boot_jump_vxworks(struct bootm_headers *images); #endif |