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 9bd30f96a73d1ac7ff2af3dd049649303d9453e7..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;
@@ -165,16 +157,20 @@ unsigned char spi_read(void)
        return (unsigned char)gpio_read_in_bit(SPI_DIN_GPIO15);
 }
 
-void taihu_spi_chipsel(int cs)
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 {
-       gpio_write_bit(SPI_CS_GPIO0, cs);
+       return bus == 0 && cs == 0;
 }
 
-spi_chipsel_type spi_chipsel[]= {
-       taihu_spi_chipsel
-};
+void spi_cs_activate(struct spi_slave *slave)
+{
+       gpio_write_bit(SPI_CS_GPIO0, 1);
+}
 
-int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+       gpio_write_bit(SPI_CS_GPIO0, 0);
+}
 
 #ifdef CONFIG_PCI
 static unsigned char int_lines[32] = {
@@ -196,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);
+}