diff options
| author | Simon Glass <sjg@chromium.org> | 2015-10-19 06:49:57 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-24 13:50:35 -0400 |
| commit | 12360982fa03b8d6ff9140f05067c3a8635c3540 (patch) | |
| tree | 62a1d4ce06c4cd95f8bd21310e5b7ba711534a59 | |
| parent | af6bbd4daefc314cc422381580f11fabc9cb222f (diff) | |
| download | u-boot-12360982fa03b8d6ff9140f05067c3a8635c3540.zip u-boot-12360982fa03b8d6ff9140f05067c3a8635c3540.tar.gz u-boot-12360982fa03b8d6ff9140f05067c3a8635c3540.tar.bz2 | |
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 <sjg@chromium.org>
| -rw-r--r-- | common/init/board_init.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c index e7ebca7..1c6126d 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) |