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

Moved initialization of MCFFEC Ethernet driver to CPU directory

Browse Source 
Added a cpu_eth_init() function to coldfire CPU directories and
removed code from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2008-08-26 22:16:25 -07:00
parent b31da88b9c
commit 86882b8077
7 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpu/mcf523x/cpu.c
View File

@ -107,3 +107,17 @@ int watchdog_init(void)
return (0); return (0);
} }
#endif /* CONFIG_WATCHDOG */ #endif /* CONFIG_WATCHDOG */
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
* int board_eth_init(bd_t *bis)
*/
extern int mcffec_initialize(bd_t*);
int cpu_eth_init(bd_t *bis)
{
return mcffec_initialize(bis);
}
#endif

15
cpu/mcf52x2/cpu.c
View File

@ -321,3 +321,18 @@ int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
return 0; return 0;
}; };
#endif #endif
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
* int board_eth_init(bd_t *bis)
*/
extern int mcffec_initialize(bd_t*);
int cpu_eth_init(bd_t *bis)
{
return mcffec_initialize(bis);
}
#endif

14
cpu/mcf532x/cpu.c
View File

@ -129,3 +129,17 @@ int watchdog_init(void)
return (0); return (0);
} }
#endif /* CONFIG_WATCHDOG */ #endif /* CONFIG_WATCHDOG */
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
* int board_eth_init(bd_t *bis)
*/
extern int mcffec_initialize(bd_t*);
int cpu_eth_init(bd_t *bis)
{
return mcffec_initialize(bis);
}
#endif

14
cpu/mcf5445x/cpu.c
View File

@ -95,3 +95,17 @@ int checkcpu(void)
return 0; return 0;
} }
#if defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
* int board_eth_init(bd_t *bis)
*/
extern int mcffec_initialize(bd_t*);
int cpu_eth_init(bd_t *bis)
{
return mcffec_initialize(bis);
}
#endif

16
cpu/mcf547x_8x/cpu.c
View File

@ -142,11 +142,23 @@ int watchdog_init(void)
} }
#endif /* CONFIG_HW_WATCHDOG */ #endif /* CONFIG_HW_WATCHDOG */
#if defined(CONFIG_FSLDMAFEC) #if defined(CONFIG_FSLDMAFEC) || defined(CONFIG_MCFFEC)
/* Default initializations for MCFFEC controllers. To override,
* create a board-specific function called:
* int board_eth_init(bd_t *bis)
*/
extern int mcdmafec_initialize(bd_t *bis); extern int mcdmafec_initialize(bd_t *bis);
extern int mcffec_initialize(bd_t*);
int cpu_eth_init(bd_t *bis) int cpu_eth_init(bd_t *bis)
{ {
return mcdmafec_initialize(bis); #if defined(CONFIG_FSLDMAFEC)
mcdmafec_initialize(bis);
#endif
#if defined(CONFIG_MCFFEC)
mcffec_initialize(bis);
#endif
return 0;
} }
#endif #endif

2
drivers/net/mcffec.c
View File

@ -599,5 +599,5 @@ int mcffec_initialize(bd_t * bis)
/* default speed */ /* default speed */
bis->bi_ethspeed = 10; bis->bi_ethspeed = 10;
return 1; return 0;
} }

4
net/eth.c
View File

@ -70,7 +70,6 @@ extern int npe_initialize(bd_t *);
extern int uec_initialize(int); extern int uec_initialize(int);
extern int bfin_EMAC_initialize(bd_t *); extern int bfin_EMAC_initialize(bd_t *);
extern int greth_initialize(bd_t *); extern int greth_initialize(bd_t *);
extern int mcffec_initialize(bd_t*);
extern int at91sam9_eth_initialize(bd_t *); extern int at91sam9_eth_initialize(bd_t *);
#ifdef CONFIG_API #ifdef CONFIG_API
@ -271,9 +270,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_GRETH) #if defined(CONFIG_GRETH)
greth_initialize(bis); greth_initialize(bis);
#endif #endif
#if defined(CONFIG_MCFFEC)
mcffec_initialize(bis);
#endif
#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
defined(CONFIG_AT91SAM9263) defined(CONFIG_AT91SAM9263)
at91sam9_eth_initialize(bis); at91sam9_eth_initialize(bis);