diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-09-14 17:06:43 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-09-14 17:06:43 +0200 |
| commit | 3edb0ccf61ab495edf400f8baf1a2d333ae2fe1c (patch) | |
| tree | 4478c67283df8bf8a57248d847a2e8705966ade9 | |
| parent | e1b7296126bc22825950c24343302205228bdb8d (diff) | |
| parent | 47278471f9b8c851241cb6154422c33439adeb90 (diff) | |
| download | u-boot-imx-3edb0ccf61ab495edf400f8baf1a2d333ae2fe1c.zip u-boot-imx-3edb0ccf61ab495edf400f8baf1a2d333ae2fe1c.tar.gz u-boot-imx-3edb0ccf61ab495edf400f8baf1a2d333ae2fe1c.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | cpu/ppc4xx/4xx_enet.c | 3 | ||||
| -rw-r--r-- | include/configs/ebony.h | 7 |
3 files changed, 12 insertions, 2 deletions
@@ -2,6 +2,10 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Fix problem in 440GP ethernet driver (ebony). Add support for 2nd + ethernet port on ebony. + Patch by Stefan Roese, 7 Sep 2005 + * Added support for mtddevnum and mtddevname variables (mtdparts command) * Change default console baud rate for stxxtc board diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c index 7766f9a..79be865 100644 --- a/cpu/ppc4xx/4xx_enet.c +++ b/cpu/ppc4xx/4xx_enet.c @@ -365,6 +365,9 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) out32 (ZMII_FER, (ZMII_FER_RMII | ZMII_FER_MDI) << ZMII_FER_V (devnum)); #elif defined(CONFIG_440GX) ethgroup = ppc_4xx_eth_setup_bridge(devnum, bis); +#elif defined(CONFIG_440GP) + /* set RMII mode */ + out32 (ZMII_FER, ZMII_RMII | ZMII_MDI0); #else if ((devnum == 0) || (devnum == 1)) { out32 (ZMII_FER, (ZMII_FER_SMII | ZMII_FER_MDI) << ZMII_FER_V (devnum)); diff --git a/include/configs/ebony.h b/include/configs/ebony.h index ebd0b53..1d4ea4e 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -31,6 +31,7 @@ * High Level Configuration Options *----------------------------------------------------------------------*/ #define CONFIG_EBONY 1 /* Board is ebony */ +#define CONFIG_440GP 1 /* Specifc GP support */ #define CONFIG_4xx 1 /* ... PPC4xx family */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #undef CFG_DRAM_TEST /* Disable-takes long time! */ @@ -191,6 +192,10 @@ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 8 /* PHY address */ +#define CONFIG_HAS_ETH1 +#define CONFIG_PHY1_ADDR 9 /* EMAC1 PHY address */ +#define CONFIG_NET_MULTI 1 +#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ #define CONFIG_COMMANDS (CONFIG_CMD_DFL | \ CFG_CMD_ASKENV | \ @@ -241,8 +246,6 @@ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ -#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */ - /*----------------------------------------------------------------------- * PCI stuff *----------------------------------------------------------------------- |