minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved initialization of IncaIP Ethernet controller to board_eth_init

Browse Source 
Affected boards:
	IncaIP

Removed initialization of the driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2008-08-31 10:16:59 -07:00
parent 164846eeb2
commit 8218bd2aa6
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
board/incaip/incaip.c
View File

@ -23,6 +23,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <netdev.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/inca-ip.h> #include <asm/inca-ip.h>
#include <asm/io.h> #include <asm/io.h>
@ -116,3 +117,10 @@ int checkboard (void)
return 0; return 0;
} }
#if defined(CONFIG_INCA_IP_SWITCH)
int board_eth_init(bd_t *bis)
{
return inca_switch_initialize(bis);
}
#endif

3
drivers/net/inca-ip_sw.c
View File

@ -28,6 +28,7 @@
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include <asm/inca-ip.h> #include <asm/inca-ip.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
@ -199,7 +200,7 @@ int inca_switch_initialize(bd_t * bis)
printf("Leaving inca_switch_initialize()\n"); printf("Leaving inca_switch_initialize()\n");
#endif #endif
return 1; return 0;
} }

1
include/netdev.h
View File

@ -45,6 +45,7 @@ int bfin_EMAC_initialize(bd_t *bis);
int eth_3com_initialize (bd_t * bis); int eth_3com_initialize (bd_t * bis);
int greth_initialize(bd_t *bis); int greth_initialize(bd_t *bis);
void gt6426x_eth_initialize(bd_t *bis); void gt6426x_eth_initialize(bd_t *bis);
int inca_switch_initialize(bd_t *bis);
int macb_eth_initialize(int id, void *regs, unsigned int phy_addr); int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
int mcdmafec_initialize(bd_t *bis); int mcdmafec_initialize(bd_t *bis);
int mcffec_initialize(bd_t *bis); int mcffec_initialize(bd_t *bis);

4
net/eth.c
View File

@ -44,7 +44,6 @@ extern int dc21x4x_initialize(bd_t*);
extern int e1000_initialize(bd_t*); extern int e1000_initialize(bd_t*);
extern int eepro100_initialize(bd_t*); extern int eepro100_initialize(bd_t*);
extern int fec_initialize(bd_t*); extern int fec_initialize(bd_t*);
extern int inca_switch_initialize(bd_t*);
extern int mpc5xxx_fec_initialize(bd_t*); extern int mpc5xxx_fec_initialize(bd_t*);
extern int mpc512x_fec_initialize(bd_t*); extern int mpc512x_fec_initialize(bd_t*);
extern int mpc8220_fec_initialize(bd_t*); extern int mpc8220_fec_initialize(bd_t*);
@ -169,9 +168,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000) #if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
ppc_4xx_eth_initialize(bis); ppc_4xx_eth_initialize(bis);
#endif #endif
#ifdef CONFIG_INCA_IP_SWITCH
inca_switch_initialize(bis);
#endif
#ifdef CONFIG_PLB2800_ETHER #ifdef CONFIG_PLB2800_ETHER
plb2800_eth_initialize(bis); plb2800_eth_initialize(bis);
#endif #endif