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

cm-t35: various cleanups

Browse Source 
Move #ifdef CONFIG_SMC911X out of board_eth_init() function,
simplify the board_mmc_init() function, and enclose handle_mac_address()
in the CONFIG_SMC911X.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Nikita Kiryanov 2012-01-02 04:01:31 +00:00 committed by Albert ARIBAUD
parent 9fc376be28
commit ce15ec9f69
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/cm_t35/cm_t35.c
View File

@ -1,6 +1,5 @@
/* /*
* (C) Copyright 2011 * (C) Copyright 2011 CompuLab, Ltd. <www.compulab.co.il>
* CompuLab, Ltd. <www.compulab.co.il>
* *
* Authors: Mike Rapoport <mike@compulab.co.il> * Authors: Mike Rapoport <mike@compulab.co.il>
* Igor Grinberg <grinberg@compulab.co.il> * Igor Grinberg <grinberg@compulab.co.il>
@ -316,8 +315,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); return omap_mmc_init(0);
return 0;
} }
#endif #endif
@ -370,6 +368,7 @@ static void reset_net_chip(void)
static inline void reset_net_chip(void) {} static inline void reset_net_chip(void) {}
#endif #endif
#ifdef CONFIG_SMC911X
/* /*
* Routine: handle_mac_address * Routine: handle_mac_address
* Description: prepare MAC address for on-board Ethernet. * Description: prepare MAC address for on-board Ethernet.
@ -404,7 +403,6 @@ int board_eth_init(bd_t *bis)
{ {
int rc = 0, rc1 = 0; int rc = 0, rc1 = 0;
#ifdef CONFIG_SMC911X
setup_net_chip_gmpc(); setup_net_chip_gmpc();
reset_net_chip(); reset_net_chip();
@ -419,7 +417,7 @@ int board_eth_init(bd_t *bis)
rc1 = smc911x_initialize(1, SB_T35_SMC911X_BASE); rc1 = smc911x_initialize(1, SB_T35_SMC911X_BASE);
if (rc1 > 0) if (rc1 > 0)
rc++; rc++;
#endif
return rc; return rc;
} }
#endif