| Message ID | 20201116214731.29128-5-michael@walle.cc |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | spl: atf: add support for LOAD_IMAGE_V2 | expand |
On 16. 11. 20 22:47, Michael Walle wrote: > 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> > --- > common/spl/spl_atf.c | 11 +++++++++++ > 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 63af6a6207..51b45d5dc6 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 fd5454c55b..e173a10ca9 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__ */ > > Acked-by: Michal Simek <michal.simek@xilinx.com> M
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 63af6a6207..51b45d5dc6 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 fd5454c55b..e173a10ca9 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__ */
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> --- common/spl/spl_atf.c | 11 +++++++++++ include/atf_common.h | 14 -------------- 2 files changed, 11 insertions(+), 14 deletions(-)