diff options
author | Michael Walle <michael@walle.cc> | 2020-11-18 17:45:57 +0100 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-12-04 16:09:05 -0500 |
commit | 553825c1090c9f6968e81a0d40d0a3f42202fc6b (patch) | |
tree | 568a5b6b1c26d3be24eeb5d6d56bd2527e41c257 | |
parent | d2cb0c8f759ddc9cbc063816454d5f0d18d7fcb1 (diff) | |
download | u-boot-553825c1090c9f6968e81a0d40d0a3f42202fc6b.zip u-boot-553825c1090c9f6968e81a0d40d0a3f42202fc6b.tar.gz u-boot-553825c1090c9f6968e81a0d40d0a3f42202fc6b.tar.bz2 |
spl: atf: remove helper structure from common header
bl2_to_bl31_params_mem is just an implementation detail of the SPL ATF
support and is not needed anywhere else. Move it from the header to the
actual module.
Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r-- | common/spl/spl_atf.c | 11 | ||||
-rw-r--r-- | include/atf_common.h | 14 |
2 files changed, 11 insertions, 14 deletions
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 63af6a6..51b45d5 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -18,6 +18,17 @@ #include <spl.h> #include <asm/cache.h> +/* Holds all the structures we need for bl31 parameter passing */ +struct bl2_to_bl31_params_mem { + struct bl31_params bl31_params; + struct atf_image_info bl31_image_info; + struct atf_image_info bl32_image_info; + struct atf_image_info bl33_image_info; + struct entry_point_info bl33_ep_info; + struct entry_point_info bl32_ep_info; + struct entry_point_info bl31_ep_info; +}; + struct bl31_params *bl2_plat_get_bl31_params_default(uintptr_t bl32_entry, uintptr_t bl33_entry, uintptr_t fdt_addr) diff --git a/include/atf_common.h b/include/atf_common.h index fd5454c..e173a10 100644 --- a/include/atf_common.h +++ b/include/atf_common.h @@ -162,20 +162,6 @@ struct bl31_params { struct atf_image_info *bl33_image_info; }; -/******************************************************************************* - * This structure represents the superset of information that is passed to - * BL31, e.g. while passing control to it from BL2, bl31_params - * and other platform specific params - ******************************************************************************/ -struct bl2_to_bl31_params_mem { - struct bl31_params bl31_params; - struct atf_image_info bl31_image_info; - struct atf_image_info bl32_image_info; - struct atf_image_info bl33_image_info; - struct entry_point_info bl33_ep_info; - struct entry_point_info bl32_ep_info; - struct entry_point_info bl31_ep_info; -}; #endif /*__ASSEMBLY__ */ |