diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-18 12:02:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-18 12:02:11 -0500 |
| commit | 766927a7595a6f18fef460a06fdac370fd9e02cf (patch) | |
| tree | 1016a8e52a61cd1b1753df8fd5f78c4cee65e75a /include | |
| parent | 2dddc1bb296308b48f89f31e711965fa2c8091a0 (diff) | |
| parent | 71551055cbdbb059be0e2051aad7976ee9847197 (diff) | |
Merge branch '2021-02-18-SPL-FIT-OP-TEE-Linux-improvements'
- Improve interactions between SPL / OP-TEE and Linux in FIT images
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 7 | ||||
| -rw-r--r-- | include/spl.h | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/image.h b/include/image.h index d5a940313a..138c83dd28 100644 --- a/include/image.h +++ b/include/image.h @@ -1556,8 +1556,6 @@ bool android_image_print_dtb_contents(ulong hdr_addr); */ int board_fit_config_name_match(const char *name); -#if defined(CONFIG_SPL_FIT_IMAGE_POST_PROCESS) || \ - defined(CONFIG_FIT_IMAGE_POST_PROCESS) /** * board_fit_image_post_process() - Do any post-process on FIT binary data * @@ -1572,11 +1570,6 @@ int board_fit_config_name_match(const char *name); * @return no return value (failure should be handled internally) */ void board_fit_image_post_process(void **p_image, size_t *p_size); -#else -static inline void board_fit_image_post_process(void **p_image, size_t *p_size) -{ -} -#endif /* CONFIG_SPL_FIT_IMAGE_POST_PROCESS */ #define FDT_ERROR ((ulong)(-1)) diff --git a/include/spl.h b/include/spl.h index e172500b5f..0d134587de 100644 --- a/include/spl.h +++ b/include/spl.h @@ -701,9 +701,9 @@ int board_return_to_bootrom(struct spl_image_info *spl_image, /** * board_spl_fit_post_load - allow process images after loading finished - * + * @fit: Pointer to a valid Flattened Image Tree blob */ -void board_spl_fit_post_load(ulong load_addr, size_t length); +void board_spl_fit_post_load(const void *fit); /** * board_spl_fit_size_align - specific size align before processing payload |