diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-08-21 23:05:19 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-04 21:45:39 +0200 |
| commit | 5e93bd1c9aaea886c5e5c7c1b6114ab36c30668f (patch) | |
| tree | ec61a4a1610baf8ebfad8fc08688c393368c4dbd /lib_nios/board.c | |
| parent | 65f6f07b72a71b83d775c4d20d7ebcd6b2d2086d (diff) | |
| download | u-boot-imx-5e93bd1c9aaea886c5e5c7c1b6114ab36c30668f.zip u-boot-imx-5e93bd1c9aaea886c5e5c7c1b6114ab36c30668f.tar.gz u-boot-imx-5e93bd1c9aaea886c5e5c7c1b6114ab36c30668f.tar.bz2 | |
Consolidate arch-specific sbrk() implementations
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'lib_nios/board.c')
| -rw-r--r-- | lib_nios/board.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/lib_nios/board.c b/lib_nios/board.c index cd23457..30cdb47 100644 --- a/lib_nios/board.c +++ b/lib_nios/board.c @@ -27,6 +27,7 @@ #include <common.h> #include <stdio_dev.h> #include <watchdog.h> +#include <malloc.h> #include <net.h> #ifdef CONFIG_STATUS_LED #include <status_led.h> @@ -52,13 +53,6 @@ extern void malloc_bin_reloc (void); typedef int (init_fnc_t) (void); /* - * Begin and End of memory area for malloc(), and current "brk" - */ -static ulong mem_malloc_start = 0; -static ulong mem_malloc_end = 0; -static ulong mem_malloc_brk = 0; - -/* * The Malloc area is immediately below the monitor copy in RAM */ static void mem_malloc_init (void) @@ -71,18 +65,6 @@ static void mem_malloc_init (void) mem_malloc_end - mem_malloc_start); } -void *sbrk (ptrdiff_t increment) -{ - ulong old = mem_malloc_brk; - ulong new = old + increment; - - if ((new < mem_malloc_start) || (new > mem_malloc_end)) { - return (NULL); - } - mem_malloc_brk = new; - return ((void *) old); -} - /************************************************************************ * Initialization sequence * |