summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-02-28 00:49:47 +0000
committerwdenk <wdenk>2003-02-28 00:49:47 +0000
commit6069ff265362ef6239749b5f598b137f407b821e (patch)
tree991432052f2aa7da45d8c1d51db9f80478d7e75d /net
parent2a9e02ead3024f33658f1f4110834d0601dd6b2f (diff)
downloadu-boot-6069ff265362ef6239749b5f598b137f407b821e.tar.gz
u-boot-6069ff265362ef6239749b5f598b137f407b821e.tar.bz2
u-boot-6069ff265362ef6239749b5f598b137f407b821e.zip
* Add support for 16 MB flash configuration of TRAB board
* Patch by Erwin Rol, 27 Feb 2003: Add support for RTEMS * Add image information to README * Fix dual PCMCIA slot support (when running with just one slot populated) * Add VFD type detection to trab board * extend drivers/cs8900.c driver to synchronize ethaddr environment variable with value in the EEPROM * Start adding MIPS support files
Diffstat (limited to 'net')
-rw-r--r--net/eth.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/eth.c b/net/eth.c
index 47699f1f0b..8742c1e60b 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -39,6 +39,7 @@ extern int eth_3com_initialize(bd_t*);
extern int pcnet_initialize(bd_t*);
extern int fec_initialize(bd_t*);
extern int scc_initialize(bd_t*);
+extern int inca_switch_initialize(bd_t*);
static struct eth_device *eth_devices, *eth_current;
@@ -95,6 +96,9 @@ int eth_initialize(bd_t *bis)
eth_devices = NULL;
eth_current = NULL;
+#ifdef CONFIG_INCA_IP_SWITCH
+ inca_switch_initialize(bis);
+#endif
#ifdef CONFIG_EEPRO100
eepro100_initialize(bis);
#endif
@@ -153,7 +157,7 @@ int eth_initialize(bd_t *bis)
if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
memcmp(dev->enetaddr, env_enetaddr, 6))
{
- printf("\nWarning: %s HW address don't match:\n", dev->name);
+ printf("\nWarning: %s MAC addresses don't match:\n", dev->name);
printf("Address in SROM is "
"%02X:%02X:%02X:%02X:%02X:%02X\n",
dev->enetaddr[0], dev->enetaddr[1],