i386: Fix link collisions resulting from gcc4.4.1 upgrade

[u-boot] / lib_nios2 / board.c

diff --git a/lib_nios2/board.c b/lib_nios2/board.c
index e5a8d54069e652e86d2040ee15e1f4a84c4dc0d6..008f04f956277ddabe75cca2850c38e5d51ac306 100644 (file)
--- a/lib_nios2/board.c
+++ b/lib_nios2/board.c
@@ -52,22 +52,8 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 
 
-extern void malloc_bin_reloc (void);
 typedef int (init_fnc_t) (void);
 
-/*
- * The Malloc area is immediately below the monitor copy in RAM
- */
-static void mem_malloc_init (void)
-{
-       mem_malloc_start = CONFIG_SYS_MALLOC_BASE;
-       mem_malloc_end = mem_malloc_start + CONFIG_SYS_MALLOC_LEN;
-       mem_malloc_brk = mem_malloc_start;
-       memset ((void *) mem_malloc_start,
-               0,
-               mem_malloc_end - mem_malloc_start);
-}
-
 
 /************************************************************************
  * Initialization sequence                                             *
@@ -131,8 +117,9 @@ void board_init (void)
        }
 
        WATCHDOG_RESET ();
-       mem_malloc_init();
-       malloc_bin_reloc();
+
+       /* The Malloc area is immediately below the monitor copy in RAM */
+       mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
 
        WATCHDOG_RESET ();
        bd->bi_flashsize = flash_init();