summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2020-11-18 17:45:55 +0100
committerTom Rini <trini@konsulko.com>2020-12-04 16:09:05 -0500
commit37c218a06e50727ee5b13640f0cfeee396dc1c10 (patch)
tree2c5a631aef50efc926f4d3dc37047cf82559a413
parent59b07a257ccee6e8a624ba33f4074b12c2453cf9 (diff)
downloadu-boot-37c218a06e50727ee5b13640f0cfeee396dc1c10.tar.gz
u-boot-37c218a06e50727ee5b13640f0cfeee396dc1c10.tar.bz2
u-boot-37c218a06e50727ee5b13640f0cfeee396dc1c10.zip
spl: atf: move storage for bl31_params into function
There is no need to have the storage available globally. This is also a preparation for LOAD_IMAGE_V2 support. That will introduce a similar generator function which also has its own storage. Signed-off-by: Michael Walle <michael@walle.cc> Acked-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--common/spl/spl_atf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 9bd25f6b32..df0a198d55 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -18,13 +18,12 @@
#include <spl.h>
#include <asm/cache.h>
-static struct bl2_to_bl31_params_mem bl31_params_mem;
-static struct bl31_params *bl2_to_bl31_params;
-
__weak struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
uintptr_t bl33_entry,
uintptr_t fdt_addr)
{
+ static struct bl2_to_bl31_params_mem bl31_params_mem;
+ struct bl31_params *bl2_to_bl31_params;
struct entry_point_info *bl32_ep_info;
struct entry_point_info *bl33_ep_info;