summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-12 20:48:01 +0200
committerWolfgang Denk <wd@denx.de>2010-10-12 20:48:01 +0200
commit655c54975296002587c705e05c23754edb121c2c (patch)
treeff970d8d467a7fddb8fa6217e1533a028cb4c036 /board
parent0ee8746a93e29a3d884f19598409a3bea8ff51ab (diff)
parentb98cba0911c7d0c0486d600c2aa646395adf32f4 (diff)
downloadu-boot-imx-655c54975296002587c705e05c23754edb121c2c.zip
u-boot-imx-655c54975296002587c705e05c23754edb121c2c.tar.gz
u-boot-imx-655c54975296002587c705e05c23754edb121c2c.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'board')
-rw-r--r--board/xilinx/microblaze-generic/microblaze-generic.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index 838f131..744384c 100644
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -27,6 +27,7 @@
#include <common.h>
#include <config.h>
+#include <netdev.h>
#include <asm/microblaze_intc.h>
#include <asm/asm.h>
@@ -66,3 +67,15 @@ int fsl_init2 (void) {
return 0;
}
#endif
+
+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.
+ */
+#ifdef CONFIG_XILINX_EMACLITE
+ return xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR);
+#endif
+}