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

PPC: Drop mv6436x_eth_initialize() from net/eth.c

Browse Source 
This function was defined as an extern in net/eth.c, drop that and use
standard means of calling it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
This commit is contained in:
Marek Vasut 2012-03-02 22:39:31 +00:00 committed by Wolfgang Denk
parent 4c12eeb8b5
commit 658c3b9eaf
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/Marvell/db64360/db64360.c
View File

@ -934,5 +934,9 @@ void board_prebootm_init ()
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return pci_eth_init(bis); int ret;
ret = pci_eth_init(bis);
if (!ret)
ret = mv6436x_eth_initialize(bis);
return ret;
} }

1
board/Marvell/db64360/eth.h
View File

@ -39,5 +39,6 @@ int db64360_eth0_transmit(unsigned int s, volatile char *p);
void db64360_eth0_disable(void); void db64360_eth0_disable(void);
bool network_start(bd_t *bis); bool network_start(bd_t *bis);
int mv6436x_eth_initialize(bd_t *);
#endif /* __EVB64360_ETH_H__ */ #endif /* __EVB64360_ETH_H__ */

5
board/esd/cpci750/cpci750.c
View File

@ -1101,3 +1101,8 @@ U_BOOT_CMD(
pldver, 1, 1, do_pldver, pldver, 1, 1, do_pldver,
"Show PLD version", "Show PLD version",
"Show PLD version)"); "Show PLD version)");
int board_eth_init(bd_t *bis)
{
return mv6436x_eth_initialize(bis);
}

1
board/esd/cpci750/eth.h
View File

@ -39,5 +39,6 @@ int db64360_eth0_transmit(unsigned int s, volatile char *p);
void db64360_eth0_disable(void); void db64360_eth0_disable(void);
bool network_start(bd_t *bis); bool network_start(bd_t *bis);
int mv6436x_eth_initialize(bd_t *);
#endif /* __EVB64360_ETH_H__ */ #endif /* __EVB64360_ETH_H__ */

4
net/eth.c
View File

@ -81,7 +81,6 @@ static int __def_eth_init(bd_t *bis)
int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init"))); int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init"))); int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
extern int mv6436x_eth_initialize(bd_t *);
extern int mv6446x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);
#ifdef CONFIG_API #ifdef CONFIG_API
@ -281,9 +280,6 @@ int eth_initialize(bd_t *bis)
} else } else
printf("Net Initialization Skipped\n"); printf("Net Initialization Skipped\n");
#if defined(CONFIG_DB64360) || defined(CONFIG_CPCI750)
mv6436x_eth_initialize(bis);
#endif
#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx) #if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
mv6446x_eth_initialize(bis); mv6446x_eth_initialize(bis);
#endif #endif