Merge branch 'next' of git://git.denx.de/u-boot-net into next

[u-boot] / board / armadillo / armadillo.c

diff --git a/board/armadillo/armadillo.c b/board/armadillo/armadillo.c
index de04c66385462bdfb6e9066df5000765a4d1b936..a825144c5c6544e603e340b2f540c923f6a0baf1 100644 (file)
--- a/board/armadillo/armadillo.c
+++ b/board/armadillo/armadillo.c
@@ -26,8 +26,11 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <clps7111.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* ------------------------------------------------------------------------- */
 
 
@@ -37,8 +40,6 @@
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* Activate LED flasher */
        IO_LEDFLSH = 0x40;
 
@@ -53,10 +54,19 @@ int board_init (void)
 
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
        return (0);
 }
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+#ifdef CONFIG_CS8900
+       rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
+#endif
+       return rc;
+}
+#endif