sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge with /home/sr/git/u-boot

This commit is contained in:
Wolfgang Denk 2005-09-14 16:59:18 +02:00
parent 5d244ea128 4a3cd9e655
commit 47278471f9
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -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
* Add I2C support to TQM8540 and TQM8560 boards (EEPROM, RTC, LM75-DTT).
Patch by Stefan Roese, 31 Aug 2005

3
cpu/ppc4xx/4xx_enet.c
View File

@ -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));

7
include/configs/ebony.h
View File

@ -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
*-----------------------------------------------------------------------