Merge git://git.denx.de/u-boot-rockchip

[people/ms/u-boot.git] / common / spl / spl_atf.c

diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index a942de9964a3cc7e6b2d02e6100e68334636c6d3..5f9aa95e3078c5fb45b3ef2e864089ea68b05d63 100644 (file)
--- 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 */