diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-28 13:56:19 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-28 13:56:19 -0500 |
| commit | f2ee91501892d3280a4c58093ad3a18dccd0b562 (patch) | |
| tree | 46bba8f1e2aed3dcb868ce9e4fbd010c2ef12b13 /common | |
| parent | 4f6c7b12ed425095e635c32f184e8f8002da3823 (diff) | |
| parent | 0289e291a5140b9e97ff3b1a12819ba0d5015887 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_atf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index a942de9964..5f9aa95e30 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 */ |