Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

km82xx, km83xx: move ethernet_present() from common to cpu specific

Browse source 
For kmvect1 we need a special solution and for km_arm boards we already
have. So move the common code to the architectur specific file.

Signed-off-by: Karlheinz Jerg <karlheinz.jerg@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
This commit is contained in:
Karlheinz Jerg 2013-01-21 03:55:16 +00:00 committed by Kim Phillips
parent cf976ce478
commit 1eb95ebe0d
3 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
board/keymile/common/common.c
View file

@ -183,17 +183,6 @@ void i2c_init_board(void)
} }
#endif #endif
#if !defined(MACH_TYPE_KM_KIRKWOOD)
int ethernet_present(void)
{
struct km_bec_fpga *base =
(struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE;
return in_8(&base->bprth) & PIGGY_PRESENT;
}
#endif
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
if (ethernet_present()) if (ethernet_present())

8
board/keymile/km82xx/km82xx.c
View file

@ -385,6 +385,14 @@ void handle_mgcoge3un_reset(void)
} }
#endif #endif
int ethernet_present(void)
{
struct km_bec_fpga *base =
(struct km_bec_fpga *)CONFIG_SYS_KMBEC_FPGA_BASE;
return in_8(&base->bprth) & PIGGY_PRESENT;
}
/* /*
* Early board initalization. * Early board initalization.
*/ */

24
board/keymile/km83xx/km83xx.c
View file

@ -133,6 +133,28 @@ const uint upma_table[] = {
}; };
#endif #endif
static int piggy_present(void)
{
struct km_bec_fpga __iomem *base =
(struct km_bec_fpga __iomem *)CONFIG_SYS_KMBEC_FPGA_BASE;
return in_8(&base->bprth) & PIGGY_PRESENT;
}
#if defined(CONFIG_KMVECT1)
int ethernet_present(void)
{
/* ethernet port connected to simple switch without piggy */
return 1;
}
#else
int ethernet_present(void)
{
return piggy_present();
}
#endif
int board_early_init_r(void) int board_early_init_r(void)
{ {
struct km_bec_fpga *base = struct km_bec_fpga *base =
@ -280,7 +302,7 @@ int checkboard(void)
{ {
puts("Board: Keymile " CONFIG_KM_BOARD_NAME); puts("Board: Keymile " CONFIG_KM_BOARD_NAME);
if (ethernet_present()) if (piggy_present())
puts(" with PIGGY."); puts(" with PIGGY.");
puts("\n"); puts("\n");
return 0; return 0;