diff options
| author | Tom Rini <[email protected]> | 2019-07-02 08:18:19 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-07-02 08:18:19 -0400 |
| commit | ca4491f2d2af93d8b77c48c5d272d88094fc06eb (patch) | |
| tree | b9b490d970c909e9b7cffcc857eca3b6ffbed3da /common | |
| parent | 8c2d42d526574a6d972d7711660b652d2aeba7e1 (diff) | |
| parent | 665ebcadd69b8d3ebce946709e23f0df0bee7b56 (diff) | |
Merge tag 'rockchip-for-v2019.07-rc5-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- fix for atf bl31_image_info pointer
- fix for rockpro64 vdd_log init
- fix for tinker-rk3288 SPL size too big
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_atf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index cddab6a7358..4715f9d3719 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -45,6 +45,7 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry) SET_PARAM_HEAD(bl2_to_bl31_params, ATF_PARAM_BL31, ATF_VERSION_1, 0); /* Fill BL31 related information */ + bl2_to_bl31_params->bl31_image_info = &bl31_params_mem.bl31_image_info; SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info, ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); |