diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2009-10-04 22:37:03 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2009-10-04 22:37:03 -0700 |
| commit | 7194ab809532eeca3e2ee5dc12017cb901cc5842 (patch) | |
| tree | 635cd41e409da222cfa7f975d1fcccfc14cc9b8c /board/armltd/integrator/integrator.c | |
| parent | 32e7f239dda8638377edb0d3e7ac269cabbafbe6 (diff) | |
| download | u-boot-imx-7194ab809532eeca3e2ee5dc12017cb901cc5842.zip u-boot-imx-7194ab809532eeca3e2ee5dc12017cb901cc5842.tar.gz u-boot-imx-7194ab809532eeca3e2ee5dc12017cb901cc5842.tar.bz2 | |
Convert SMC91111 Ethernet driver to CONFIG_NET_MULTI API
All in-tree boards that use this controller have CONFIG_NET_MULTI
added
Also:
- changed CONFIG_DRIVER_SMC91111 to CONFIG_SMC91111
- cleaned up line lengths
- modified all boards that override weak function in this driver
- modified all eeprom standalone apps to work with new driver
- updated blackfin standalone EEPROM app after testing
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'board/armltd/integrator/integrator.c')
| -rw-r--r-- | board/armltd/integrator/integrator.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index a46deea..518944e 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -34,9 +34,7 @@ */ #include <common.h> -#ifdef CONFIG_PCI #include <netdev.h> -#endif DECLARE_GLOBAL_DATA_PTR; @@ -127,9 +125,16 @@ extern void dram_query(void); return 0; } -#ifdef CONFIG_PCI +#ifdef CONFIG_CMD_NET int board_eth_init(bd_t *bis) { - return pci_eth_init(bis); + int rc = 0; +#ifdef CONFIG_SMC91111 + rc = smc91111_initialize(0, CONFIG_SMC91111_BASE); +#endif +#ifdef CONFIG_PCI + rc += pci_eth_init(bis); +#endif + return rc; } #endif |