env_nand.c: print error message and fail gracefully

[u-boot] / lib_sh / board.c

diff --git a/lib_sh/board.c b/lib_sh/board.c
index 5d61f0d74fe1b7f1f425468d6158c7bc97a16448..c97e20c3e1cfc3f3a7cc2506835c59e3071c5562 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);
@@ -88,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;
@@ -178,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;