Merge branch 'master' into next

[platform/kernel/u-boot.git] / lib_sh / board.c

diff --git a/lib_sh/board.c b/lib_sh/board.c
index 2691316..c97e20c 100644 (file)
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -28,7 +28,10 @@
 #include <net.h>
 #include <environment.h>
 
-extern void malloc_bin_reloc (void);
+#ifdef CONFIG_BITBANGMII
+#include <miiphy.h>
+#endif
+
 extern int cpu_init(void);
 extern int board_init(void);
 extern int dram_init(void);
@@ -38,15 +41,6 @@ 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(ulong start, ulong size)
-{
-       mem_malloc_start = start;
-       mem_malloc_end = start + size;
-       mem_malloc_brk = start;
-
-       memset((void *)mem_malloc_start, 0, size);
-}
-
 static int sh_flash_init(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
@@ -97,7 +91,6 @@ static int sh_mem_env_init(void)
 {
        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();
        return 0;
@@ -187,6 +180,9 @@ void sh_generic_init(void)
 #endif /* CONFIG_WATCHDOG*/
 
 
+#ifdef CONFIG_BITBANGMII
+       bb_miiphy_init();
+#endif
 #if defined(CONFIG_CMD_NET)
        {
                char *s;