summaryrefslogtreecommitdiff
path: root/board/mpc8540eval
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-03 22:43:57 +0200
committerWolfgang Denk <wd@denx.de>2008-09-03 22:43:57 +0200
commit16116ddd0d0158f4e91c91dc979b845b6e98a99d (patch)
treee2062a888c76462b6335da29092c5fe4134c0859 /board/mpc8540eval
parent628ffd73bcff0c9f3bc5a8eeb2c7455fe9d28a51 (diff)
parentbe1b0d2777e179191a57b138b660547a17e55aad (diff)
downloadu-boot-imx-16116ddd0d0158f4e91c91dc979b845b6e98a99d.zip
u-boot-imx-16116ddd0d0158f4e91c91dc979b845b6e98a99d.tar.gz
u-boot-imx-16116ddd0d0158f4e91c91dc979b845b6e98a99d.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'board/mpc8540eval')
-rw-r--r--board/mpc8540eval/mpc8540eval.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/board/mpc8540eval/mpc8540eval.c b/board/mpc8540eval/mpc8540eval.c
index 7c54458..028a70f 100644
--- a/board/mpc8540eval/mpc8540eval.c
+++ b/board/mpc8540eval/mpc8540eval.c
@@ -24,6 +24,7 @@
*/
#include <common.h>
+#include <netdev.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
@@ -247,3 +248,14 @@ long int fixed_sdram (void)
return (CFG_SDRAM_SIZE * 1024 * 1024);
}
#endif /* !defined(CONFIG_SPD_EEPROM) */
+
+int board_eth_init(bd_t *bis)
+{
+ /*
+ * This board either has PCI NICs or uses the CPU's TSECs
+ * pci_eth_init() will return 0 if no NICs found, so in that case
+ * returning -1 will force cpu_eth_init() to be called.
+ */
+ int num = pci_eth_init(bis);
+ return (num <= 0 ? -1 : num);
+}