diff options
| author | Stefan Roese <sr@denx.de> | 2005-11-01 10:02:21 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2005-11-01 10:02:21 +0100 |
| commit | d9f2f5008c32c8373d68a4c8e14f50a469965a23 (patch) | |
| tree | 64dd39bdb04a7b0d4034d3037e288e7d2341379f /lib_i386/board.c | |
| parent | e190290ba40fc5340cefd04dd6abf5def15065b9 (diff) | |
| parent | be360d9824d653780ebd3ffc08f1938a8e3dd747 (diff) | |
Merge with /git/u-boot.git
Diffstat (limited to 'lib_i386/board.c')
| -rw-r--r-- | lib_i386/board.c | 21 |
1 files changed, 11 insertions, 10 deletions
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(); /* |