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_ppc/board.c | |
| parent | e190290ba40fc5340cefd04dd6abf5def15065b9 (diff) | |
| parent | be360d9824d653780ebd3ffc08f1938a8e3dd747 (diff) | |
| download | u-boot-d9f2f5008c32c8373d68a4c8e14f50a469965a23.tar.gz u-boot-d9f2f5008c32c8373d68a4c8e14f50a469965a23.tar.xz u-boot-d9f2f5008c32c8373d68a4c8e14f50a469965a23.zip | |
Merge with /git/u-boot.git
Diffstat (limited to 'lib_ppc/board.c')
| -rw-r--r-- | lib_ppc/board.c | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index c3ce33f9ee..b8dd18ba92 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -899,27 +899,6 @@ void board_init_r (gd_t *id, ulong dest_addr) hermes_start_lxt980 ((int) bd->bi_ethspeed); #endif -#if (CONFIG_COMMANDS & CFG_CMD_NET) && ( \ - defined(CONFIG_CCM) || \ - defined(CONFIG_ELPT860) || \ - defined(CONFIG_EP8260) || \ - defined(CONFIG_IP860) || \ - defined(CONFIG_IVML24) || \ - defined(CONFIG_IVMS8) || \ - defined(CONFIG_MPC8260ADS) || \ - defined(CONFIG_MPC8266ADS) || \ - defined(CONFIG_MPC8560ADS) || \ - defined(CONFIG_PCU_E) || \ - defined(CONFIG_RPXSUPER) || \ - defined(CONFIG_STXGP3) || \ - defined(CONFIG_SPD823TS) || \ - defined(CONFIG_RESET_PHY_R) ) - - WATCHDOG_RESET (); - debug ("Reset Ethernet PHY\n"); - reset_phy (); -#endif - #if (CONFIG_COMMANDS & CFG_CMD_KGDB) WATCHDOG_RESET (); puts ("KGDB: "); @@ -978,12 +957,35 @@ void board_init_r (gd_t *id, ulong dest_addr) nand_init(); /* go init the NAND */ #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 (bd); #endif +#if (CONFIG_COMMANDS & CFG_CMD_NET) && ( \ + defined(CONFIG_CCM) || \ + defined(CONFIG_ELPT860) || \ + defined(CONFIG_EP8260) || \ + defined(CONFIG_IP860) || \ + defined(CONFIG_IVML24) || \ + defined(CONFIG_IVMS8) || \ + defined(CONFIG_MPC8260ADS) || \ + defined(CONFIG_MPC8266ADS) || \ + defined(CONFIG_MPC8560ADS) || \ + defined(CONFIG_PCU_E) || \ + defined(CONFIG_RPXSUPER) || \ + defined(CONFIG_STXGP3) || \ + defined(CONFIG_SPD823TS) || \ + defined(CONFIG_RESET_PHY_R) ) + + WATCHDOG_RESET (); + debug ("Reset Ethernet PHY\n"); + reset_phy (); +#endif + #ifdef CONFIG_POST post_run (NULL, POST_RAM | post_bootmode_get(0)); #endif |