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

PPC: Drop mv6446x_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: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Vasut 2012-03-02 22:39:32 +00:00 committed by Wolfgang Denk
parent 658c3b9eaf
commit 021f6038a2
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/Marvell/db64460/db64460.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 = mv6446x_eth_initialize(bis);
return ret;
} }

2
board/Marvell/db64460/eth.h
View File

@ -38,4 +38,6 @@ int db64460_eth0_transmit(unsigned int s, volatile char *p);
void db64460_eth0_disable(void); void db64460_eth0_disable(void);
bool network_start(bd_t *bis); bool network_start(bd_t *bis);
int mv6446x_eth_initialize(bd_t *);
#endif /* __EVB64460_ETH_H__ */ #endif /* __EVB64460_ETH_H__ */

1
board/prodrive/p3mx/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 mv6446x_eth_initialize(bd_t *);
#endif /* __EVB64360_ETH_H__ */ #endif /* __EVB64360_ETH_H__ */

5
board/prodrive/p3mx/p3mx.c
View File

@ -851,3 +851,8 @@ void my_remap_gt_regs_bootm (u32 cur_loc, u32 new_loc)
!= temp); != temp);
} }
int board_eth_init(bd_t *bis)
{
return mv6446x_eth_initialize(bis);
}

5
net/eth.c
View File

@ -81,8 +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 mv6446x_eth_initialize(bd_t *);
#ifdef CONFIG_API #ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int); extern void (*push_packet)(volatile void *, int);
@ -280,9 +278,6 @@ int eth_initialize(bd_t *bis)
} else } else
printf("Net Initialization Skipped\n"); printf("Net Initialization Skipped\n");
#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
mv6446x_eth_initialize(bis);
#endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");
show_boot_progress (-64); show_boot_progress (-64);