From 37c218a06e50727ee5b13640f0cfeee396dc1c10 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Wed, 18 Nov 2020 17:45:55 +0100 Subject: [PATCH] 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 Acked-by: Michal Simek --- common/spl/spl_atf.c | 5 ++--- 1 file 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 #include -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; -- 2.39.5