diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-29 23:45:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-29 23:45:04 +0200 |
| commit | 5d4ee51061e70118fb598e3aca082dd11a154e87 (patch) | |
| tree | b7cddabfe81abe8fa066dd082a9425bee556cd88 /lib_i386 | |
| parent | 7b5cac0e1958173a390ae6d620a610028cad25f8 (diff) | |
| parent | 99eb35dbbfd94d8d4e047952663f92526ae4dfc8 (diff) | |
| download | u-boot-imx-5d4ee51061e70118fb598e3aca082dd11a154e87.zip u-boot-imx-5d4ee51061e70118fb598e3aca082dd11a154e87.tar.gz u-boot-imx-5d4ee51061e70118fb598e3aca082dd11a154e87.tar.bz2 | |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'lib_i386')
| -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 a180814..e90eb6e 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(); /* |