Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / board / atmel / atngw100 / atngw100.c

diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c
index f2c3e79799616ea4cb6c7be67490ae235c14e80e..fa1a2aa7c12d69cd2d2b88b0b1e437c1a27c2192 100644 (file)
--- a/board/atmel/atngw100/atngw100.c
+++ b/board/atmel/atngw100/atngw100.c
@@ -26,6 +26,7 @@
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/hmatrix.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -81,7 +82,7 @@ phys_size_t initdram(int board_type)
        unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
 
        if (expected_size != actual_size)
-               printf("Warning: Only %u of %u MiB SDRAM is working\n",
+               printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
                                actual_size >> 20, expected_size >> 20);
 
        return actual_size;
@@ -93,6 +94,15 @@ void board_init_info(void)
        gd->bd->bi_phy_id[1] = 0x03;
 }
 
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bi)
+{
+       macb_eth_initialize(0, (void *)MACB0_BASE, bi->bi_phy_id[0]);
+       macb_eth_initialize(1, (void *)MACB1_BASE, bi->bi_phy_id[1]);
+       return 0;
+}
+#endif
+
 /* SPI chip select control */
 #ifdef CONFIG_ATMEL_SPI
 #include <spi.h>