From af6bbd4daefc314cc422381580f11fabc9cb222f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 19 Oct 2015 06:49:56 -0600 Subject: Move board_init_f_mem() into a common location This function will be used by both SPL and U-Boot proper. So move it into a common place. Also change the #ifdef so that the early malloc() area is not set up in SPL if CONFIG_SYS_SPL_MALLOC_START is defined. In that case it would never actually be used, and just chews up stack space. Signed-off-by: Simon Glass --- common/init/board_init.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 common/init/board_init.c (limited to 'common/init/board_init.c') diff --git a/common/init/board_init.c b/common/init/board_init.c new file mode 100644 index 00000000000..e7ebca70c4f --- /dev/null +++ b/common/init/board_init.c @@ -0,0 +1,41 @@ +/* + * Code shared between SPL and U-Boot proper + * + * Copyright (c) 2015 Google, Inc + * Written by Simon Glass + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include + +DECLARE_GLOBAL_DATA_PTR; + +/* Unfortunately x86 can't compile this code as gd cannot be assigned */ +#ifndef CONFIG_X86 +__weak void arch_setup_gd(struct global_data *gd_ptr) +{ + gd = gd_ptr; +} +#endif /* !CONFIG_X86 */ + +ulong board_init_f_mem(ulong top) +{ + struct global_data *gd_ptr; + + /* Leave space for the stack we are running with now */ + top -= 0x40; + + top -= sizeof(struct global_data); + top = ALIGN(top, 16); + gd_ptr = (struct global_data *)top; + memset(gd_ptr, '\0', sizeof(*gd)); + arch_setup_gd(gd_ptr); + +#if defined(CONFIG_SYS_MALLOC_F) + top -= CONFIG_SYS_MALLOC_F_LEN; + gd->malloc_base = top; +#endif + + return top; +} -- cgit v1.2.3 From 12360982fa03b8d6ff9140f05067c3a8635c3540 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 19 Oct 2015 06:49:57 -0600 Subject: board_init_f_mem(): Don't require memset() Unfortunately memset() is not always available, so provide a substitute when needed. Signed-off-by: Simon Glass --- common/init/board_init.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'common/init/board_init.c') diff --git a/common/init/board_init.c b/common/init/board_init.c index e7ebca70c4f..1c6126d8ce5 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -11,6 +11,16 @@ DECLARE_GLOBAL_DATA_PTR; +/* + * It isn't trivial to figure out whether memcpy() exists. The arch-specific + * memcpy() is not normally available in SPL due to code size. + */ +#if !defined(CONFIG_SPL_BUILD) || \ + (defined(CONFIG_SPL_LIBGENERIC_SUPPORT) && \ + !defined(CONFIG_USE_ARCH_MEMSET)) +#define _USE_MEMCPY +#endif + /* Unfortunately x86 can't compile this code as gd cannot be assigned */ #ifndef CONFIG_X86 __weak void arch_setup_gd(struct global_data *gd_ptr) @@ -22,6 +32,9 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) ulong board_init_f_mem(ulong top) { struct global_data *gd_ptr; +#ifndef _USE_MEMCPY + int *ptr; +#endif /* Leave space for the stack we are running with now */ top -= 0x40; @@ -29,7 +42,12 @@ ulong board_init_f_mem(ulong top) top -= sizeof(struct global_data); top = ALIGN(top, 16); gd_ptr = (struct global_data *)top; +#ifdef _USE_MEMCPY memset(gd_ptr, '\0', sizeof(*gd)); +#else + for (ptr = (int *)gd_ptr; ptr < (int *)(gd_ptr + 1); ) + *ptr++ = 0; +#endif arch_setup_gd(gd_ptr); #if defined(CONFIG_SYS_MALLOC_F) -- cgit v1.2.3 From 518f0bccc49e783ae6aa68af9cb3b3dcd912f2cf Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 19 Oct 2015 06:49:58 -0600 Subject: board_init_f_mem(): Don't create an unused early malloc() area Change the #ifdef so that the early malloc() area is not set up in SPL if CONFIG_SYS_SPL_MALLOC_START is defined. In that case it would never actually be used, and just chews up stack space. Signed-off-by: Simon Glass Tested-by: Masahiro Yamada --- common/init/board_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/init/board_init.c') diff --git a/common/init/board_init.c b/common/init/board_init.c index 1c6126d8ce5..e74b63b8a87 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -50,7 +50,8 @@ ulong board_init_f_mem(ulong top) #endif arch_setup_gd(gd_ptr); -#if defined(CONFIG_SYS_MALLOC_F) +#if defined(CONFIG_SYS_MALLOC_F) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) top -= CONFIG_SYS_MALLOC_F_LEN; gd->malloc_base = top; #endif -- cgit v1.2.3