mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-04 14:00:19 +00:00
518f0bccc4
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 <sjg@chromium.org> Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
61 lines
1.3 KiB
C
61 lines
1.3 KiB
C
/*
|
|
* Code shared between SPL and U-Boot proper
|
|
*
|
|
* Copyright (c) 2015 Google, Inc
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
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)
|
|
{
|
|
gd = gd_ptr;
|
|
}
|
|
#endif /* !CONFIG_X86 */
|
|
|
|
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;
|
|
|
|
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) && \
|
|
(!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START))
|
|
top -= CONFIG_SYS_MALLOC_F_LEN;
|
|
gd->malloc_base = top;
|
|
#endif
|
|
|
|
return top;
|
|
}
|