From 63ff004c4fcad9f690bf44dbd15d568bb47aac2d Mon Sep 17 00:00:00 2001
From: Marian Balakowicz <m8@semihalf.com>
Date: Fri, 28 Oct 2005 22:30:33 +0200
Subject: Add support for multiple PHYs.

---
 lib_i386/board.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib_i386/board.c')

diff --git a/lib_i386/board.c b/lib_i386/board.c
index a1808142e0..e90eb6e569 100644
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -317,15 +317,6 @@ void start_i386boot (void)
 	misc_init_r();
 #endif
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && (0)
-	WATCHDOG_RESET();
-# ifdef DEBUG
-	puts ("Reset Ethernet PHY\n");
-# endif
-	reset_phy();
-#endif
-
 #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
 	WATCHDOG_RESET();
 	puts ("PCMCIA:");
@@ -387,12 +378,22 @@ void start_i386boot (void)
 	doc_init();
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_NET_MULTI)
 	WATCHDOG_RESET();
 	puts("Net:   ");
+#endif
 	eth_initialize(gd->bd);
 #endif
 
+#if (CONFIG_COMMANDS & CFG_CMD_NET) && (0)
+	WATCHDOG_RESET();
+# ifdef DEBUG
+	puts ("Reset Ethernet PHY\n");
+# endif
+	reset_phy();
+#endif
+
 #ifdef CONFIG_LAST_STAGE_INIT
 	WATCHDOG_RESET();
 	/*
-- 
cgit