aboutsummaryrefslogtreecommitdiff
path: root/lib_blackfin
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-08-21 23:05:19 -0500
committerWolfgang Denk <wd@denx.de>2009-09-04 21:45:39 +0200
commit5e93bd1c9aaea886c5e5c7c1b6114ab36c30668f (patch)
treeec61a4a1610baf8ebfad8fc08688c393368c4dbd /lib_blackfin
parent65f6f07b72a71b83d775c4d20d7ebcd6b2d2086d (diff)
Consolidate arch-specific sbrk() implementations
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'lib_blackfin')
-rw-r--r--lib_blackfin/board.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c
index 5b9efde7a..9c405ba4b 100644
--- a/lib_blackfin/board.c
+++ b/lib_blackfin/board.c
@@ -44,27 +44,13 @@ static inline void serial_early_puts(const char *s)
#endif
}
-static void *mem_malloc_start, *mem_malloc_end, *mem_malloc_brk;
-
static void mem_malloc_init(void)
{
- mem_malloc_start = (void *)CONFIG_SYS_MALLOC_BASE;
- mem_malloc_end = (void *)(CONFIG_SYS_MALLOC_BASE + CONFIG_SYS_MALLOC_LEN);
+ mem_malloc_start = (ulong)CONFIG_SYS_MALLOC_BASE;
+ mem_malloc_end = (ulong)(CONFIG_SYS_MALLOC_BASE + CONFIG_SYS_MALLOC_LEN);
mem_malloc_brk = mem_malloc_start;
- memset(mem_malloc_start, 0, mem_malloc_end - mem_malloc_start);
-}
-
-void *sbrk(ptrdiff_t increment)
-{
- void *old = mem_malloc_brk;
- void *new = old + increment;
-
- if (new < mem_malloc_start || new > mem_malloc_end)
- return NULL;
-
- mem_malloc_brk = new;
- return old;
+ memset((void*)mem_malloc_start, 0, mem_malloc_end - mem_malloc_start);
}
static int display_banner(void)