| Message ID | 1516158338-11399-1-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | 0289e291a5140b9e97ff3b1a12819ba0d5015887 |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | [U-Boot] spl: atf: pass NULL for bl32_ep pc | expand |
> ATF use bl32_ep_info->pc to decide if thre is an available bl32, > let's mark it as NULL first. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > common/spl/spl_atf.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ATF use bl32_ep_info->pc to decide if thre is an available bl32, > let's mark it as NULL first. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > common/spl/spl_atf.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ATF use bl32_ep_info->pc to decide if thre is an available bl32, > let's mark it as NULL first. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > common/spl/spl_atf.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Applied to u-boot-rockchip, thanks!
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2a450c6..c4a5be2 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -50,13 +50,14 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry) ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); /* Fill BL32 related information if it exists */ -#ifdef BL32_BASE bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info; SET_PARAM_HEAD(bl2_to_bl31_params->bl32_ep_info, ATF_PARAM_EP, ATF_VERSION_1, 0); bl2_to_bl31_params->bl32_image_info = &bl31_params_mem.bl32_image_info; SET_PARAM_HEAD(bl2_to_bl31_params->bl32_image_info, ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); +#ifndef BL32_BASE + bl2_to_bl31_params->bl32_ep_info->pc = 0; #endif /* BL32_BASE */ /* Fill BL33 related information */
ATF use bl32_ep_info->pc to decide if thre is an available bl32, let's mark it as NULL first. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- common/spl/spl_atf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)