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

[oweals/u-boot.git] / board / amcc / taihu / taihu.c

diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c
index e4fdf4ae74ab9463ef4f6bcdfc9308cd9d661606..ee0939aa3cdb737dc95ca185874700e2764241cd 100644 (file)
--- a/board/amcc/taihu/taihu.c
+++ b/board/amcc/taihu/taihu.c
@@ -28,6 +28,7 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <spi.h>
+#include <netdev.h>
 #include <asm/gpio.h>
 
 extern int lcd_init(void);
@@ -77,15 +78,6 @@ int checkboard(void)
        return 0;
 }
 
-/*************************************************************************
- *  long int initdram
- *
- ************************************************************************/
-long int initdram(int board)
-{
-       return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */
-}
-
 static int do_sw_stat(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[])
 {
        char stat;
@@ -200,3 +192,8 @@ int pci_pre_init(struct pci_controller *hose)
        return 1;
 }
 #endif /* CONFIG_PCI */
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}