leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for non-CONFIG_NET_MULTI on PPC4xx EMAC

Browse Source 
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2009-04-28 16:39:19 -07:00
parent 8453587ef9
commit 6e0d2fc7fe
2 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/net/4xx_enet.c
View File

@ -259,9 +259,6 @@ static const struct fixed_phy_port fixed_phy_port[] = {
/*-----------------------------------------------------------------------------+ /*-----------------------------------------------------------------------------+
* Global variables. TX and RX descriptors and buffers. * Global variables. TX and RX descriptors and buffers.
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
#if !defined(CONFIG_NET_MULTI)
struct eth_device *emac0_dev = NULL;
#endif
/* /*
* Get count of EMAC devices (doesn't have to be the max. possible number * Get count of EMAC devices (doesn't have to be the max. possible number
@ -1643,11 +1640,7 @@ int enetInt (struct eth_device *dev)
* Because the mal is generic, we need to get the current * Because the mal is generic, we need to get the current
* eth device * eth device
*/ */
#if defined(CONFIG_NET_MULTI)
dev = eth_get_dev(); dev = eth_get_dev();
#else
dev = emac0_dev;
#endif
hw_p = dev->priv; hw_p = dev->priv;
@ -2066,60 +2059,13 @@ int ppc_4xx_eth_initialize (bd_t * bis)
virgin = 1; virgin = 1;
} }
#if defined(CONFIG_NET_MULTI)
eth_register (dev); eth_register (dev);
#else
emac0_dev = dev;
#endif
#if defined(CONFIG_NET_MULTI)
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register (dev->name, miiphy_register (dev->name,
emac4xx_miiphy_read, emac4xx_miiphy_write); emac4xx_miiphy_read, emac4xx_miiphy_write);
#endif
#endif #endif
} /* end for each supported device */ } /* end for each supported device */
return 0; return 0;
} }
#if !defined(CONFIG_NET_MULTI)
void eth_halt (void) {
if (emac0_dev) {
ppc_4xx_eth_halt(emac0_dev);
free(emac0_dev);
emac0_dev = NULL;
}
}
int eth_init (bd_t *bis)
{
ppc_4xx_eth_initialize(bis);
if (emac0_dev) {
return ppc_4xx_eth_init(emac0_dev, bis);
} else {
printf("ERROR: ethaddr not set!\n");
return -1;
}
}
int eth_send(volatile void *packet, int length)
{
return (ppc_4xx_eth_send(emac0_dev, packet, length));
}
int eth_rx(void)
{
return (ppc_4xx_eth_rx(emac0_dev));
}
int emac4xx_miiphy_initialize (bd_t * bis)
{
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register ("ppc_4xx_eth0",
emac4xx_miiphy_read, emac4xx_miiphy_write);
#endif
return 0;
}
#endif /* !defined(CONFIG_NET_MULTI) */

4
net/eth.c
View File

@ -501,7 +501,6 @@ char *eth_get_name (void)
#elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) #elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI)
extern int at91rm9200_miiphy_initialize(bd_t *bis); extern int at91rm9200_miiphy_initialize(bd_t *bis);
extern int emac4xx_miiphy_initialize(bd_t *bis);
extern int mcf52x2_miiphy_initialize(bd_t *bis); extern int mcf52x2_miiphy_initialize(bd_t *bis);
extern int ns7520_miiphy_initialize(bd_t *bis); extern int ns7520_miiphy_initialize(bd_t *bis);
@ -515,9 +514,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_AT91RM9200) #if defined(CONFIG_AT91RM9200)
at91rm9200_miiphy_initialize(bis); at91rm9200_miiphy_initialize(bis);
#endif #endif
#if defined(CONFIG_PPC4xx_EMAC)
emac4xx_miiphy_initialize(bis);
#endif
#if defined(CONFIG_MCF52x2) #if defined(CONFIG_MCF52x2)
mcf52x2_miiphy_initialize(bis); mcf52x2_miiphy_initialize(bis);
#endif #endif