summaryrefslogtreecommitdiff
path: root/lib_sh
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-08-21 23:05:20 -0500
committerWolfgang Denk <wd@denx.de>2009-09-04 21:46:32 +0200
commita483a167bc8d808145ca1224a2c238cda90aa60c (patch)
treefde71dcae066c865872f5c990c593e98a0750265 /lib_sh
parent5e93bd1c9aaea886c5e5c7c1b6114ab36c30668f (diff)
Standardize mem_malloc_init() implementation
This lays the groundwork to allow architectures to share a common mem_malloc_init(). Note that the x86 implementation was not modified as it did not fit the mold of all other architectures. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'lib_sh')
-rw-r--r--lib_sh/board.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib_sh/board.c b/lib_sh/board.c
index 001e89c7143..26913160463 100644
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -38,14 +38,13 @@ const char version_string[] = U_BOOT_VERSION" ("U_BOOT_DATE" - "U_BOOT_TIME")";
unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN;
-static void mem_malloc_init(void)
+static void mem_malloc_init(ulong start, ulong size)
{
+ mem_malloc_start = start;
+ mem_malloc_end = start + size;
+ mem_malloc_brk = start;
- mem_malloc_start = (TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN);
- mem_malloc_end = (mem_malloc_start + CONFIG_SYS_MALLOC_LEN - 16);
- mem_malloc_brk = mem_malloc_start;
- memset((void *) mem_malloc_start, 0,
- (mem_malloc_end - mem_malloc_start));
+ memset((void *)mem_malloc_start, 0, size);
}
static int sh_flash_init(void)
@@ -96,7 +95,8 @@ static int sh_pci_init(void)
static int sh_mem_env_init(void)
{
- mem_malloc_init();
+ mem_malloc_init(TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE -
+ CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
malloc_bin_reloc();
env_relocate();
jumptable_init();