diff mbox series

[v2,2/9] spl: atf: move storage for bl31_params into function

Message ID 20201118164602.22518-3-michael@walle.cc
State Accepted
Commit 37c218a06e50727ee5b13640f0cfeee396dc1c10
Delegated to: Tom Rini
Headers show
Series spl: atf: add support for LOAD_IMAGE_V2 | expand

Commit Message

Michael Walle Nov. 18, 2020, 4:45 p.m. UTC 
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>
---
 common/spl/spl_atf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Tom Rini Dec. 7, 2020, 10:19 p.m. UTC | #1 
On Wed, Nov 18, 2020 at 05:45:55PM +0100, Michael Walle wrote:

> 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>

Applied to u-boot/next, thanks!
diff mbox series

Patch

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;