diff options
| author | wdenk <wdenk> | 2004-01-03 00:43:19 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-01-03 00:43:19 +0000 |
| commit | 3a473b2a6523db9cdf2b5aed22d9730b4ebc5693 (patch) | |
| tree | 40da84736871e773141ea971d832bf0c908d59b7 /drivers | |
| parent | b6e4c4033c4f889c452c511d38c77808c67f9cf7 (diff) | |
| download | blackbird-obmc-uboot-3a473b2a6523db9cdf2b5aed22d9730b4ebc5693.tar.gz blackbird-obmc-uboot-3a473b2a6523db9cdf2b5aed22d9730b4ebc5693.zip | |
* Patch by Ronen Shitrit, 10 Dec 2003:
Add support for the Marvell DB64360 / DB64460 development boards
* Patch by Detlev Zundel, 10 Dec 2003:
fix dependency problem in examples/Makefile
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dc2114x.c | 8 | ||||
| -rw-r--r-- | drivers/eepro100.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dc2114x.c b/drivers/dc2114x.c index 9c7b5e9b69..d22d37d805 100644 --- a/drivers/dc2114x.c +++ b/drivers/dc2114x.c @@ -284,9 +284,9 @@ int dc21x4x_initialize(bd_t *bis) dev = (struct eth_device*) malloc(sizeof *dev); #ifdef CONFIG_TULIP_FIX_DAVICOM - sprintf(dev->name, "Davicom#%d", card_number); + sprintf(dev->name, "Davicom#%d", card_number); #else - sprintf(dev->name, "dc21x4x#%d", card_number); + sprintf(dev->name, "dc21x4x#%d", card_number); #endif #ifdef CONFIG_TULIP_USE_IO @@ -306,7 +306,7 @@ int dc21x4x_initialize(bd_t *bis) udelay(10 * 1000); #ifndef CONFIG_TULIP_FIX_DAVICOM - read_hw_addr(dev, bis); + read_hw_addr(dev, bis); #endif eth_register(dev); @@ -358,7 +358,7 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis) tx_ring[i].buf = 0; #ifdef CONFIG_TULIP_FIX_DAVICOM - tx_ring[i].next = cpu_to_le32(phys_to_bus((u32) &tx_ring[(i+1) % NUM_TX_DESC])); + tx_ring[i].next = cpu_to_le32(phys_to_bus((u32) &tx_ring[(i+1) % NUM_TX_DESC])); #else tx_ring[i].next = 0; #endif diff --git a/drivers/eepro100.c b/drivers/eepro100.c index 9839a184a4..906159ee3c 100644 --- a/drivers/eepro100.c +++ b/drivers/eepro100.c @@ -248,7 +248,7 @@ static int eepro100_send (struct eth_device *dev, volatile void *packet, static int eepro100_recv (struct eth_device *dev); static void eepro100_halt (struct eth_device *dev); -#if defined(CONFIG_E500) +#if defined(CONFIG_E500) || defined(CONFIG_DB64360) || defined(CONFIG_DB64460) #define bus_to_phys(a) (a) #define phys_to_bus(a) (a) #else |
