mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-29 16:10:58 +00:00
9ac4fc8207
Prior to commit 5ba534d247 ("arm: Switch 32-bit ARM to using generic
global_data setup") we used to have assembly code that configured the
malloc_base address.
Since this commit we use the board_init_f_mem() function in C to setup
malloc_base address.
In board_init_f_mem() there was a deliberate choice to support only
early malloc() or full malloc() in SPL, but not both.
Adapt this logic to allow both to be used, one after the other, in SPL.
This issue has been observed in a Congatec board, where we need to
retrieve the manufacturing information from the SPI NOR (the SPI API
calls malloc) prior to configuring the DRAM. In this case as malloc_base
was not configured we always see malloc to fail.
With this change we are able to use malloc in SPL prior to DRAM gets
initialized.
Also update the CONFIG_SYS_SPL_MALLOC_START entry in the README file.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
59 lines
1.2 KiB
C
59 lines
1.2 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)
|
|
top -= CONFIG_SYS_MALLOC_F_LEN;
|
|
gd->malloc_base = top;
|
|
#endif
|
|
|
|
return top;
|
|
}
|