Merge branch 'master' into next

[u-boot] / board / ssv / adnpesc1 / adnpesc1.c

diff --git a/board/ssv/adnpesc1/adnpesc1.c b/board/ssv/adnpesc1/adnpesc1.c
index 3ee8ba588dc20a8597c7642c2731ed024fa7e5ab..802bfba1ab685b8078198aa43cff285e830af4c8 100644 (file)
--- a/board/ssv/adnpesc1/adnpesc1.c
+++ b/board/ssv/adnpesc1/adnpesc1.c
@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <netdev.h>
 #include <nios-io.h>
 #include <spi.h>
 
@@ -57,7 +58,7 @@ int checkboard (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return (0);
 }
@@ -76,27 +77,27 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs)
 
 void spi_cs_activate(struct spi_slave *slave)
 {
-       nios_spi_t *spi = (nios_spi_t *)CFG_NIOS_SPIBASE;
+       nios_spi_t *spi = (nios_spi_t *)CONFIG_SYS_NIOS_SPIBASE;
 
        spi->slaveselect = SPI_RTC_CS_MASK;     /* activate (1) */
 }
 
 void spi_cs_deactivate(struct spi_slave *slave)
 {
-       nios_spi_t *spi = (nios_spi_t *)CFG_NIOS_SPIBASE;
+       nios_spi_t *spi = (nios_spi_t *)CONFIG_SYS_NIOS_SPIBASE;
 
        spi->slaveselect = 0;                   /* deactivate (0) */
 }
 
 #endif
 
-#if    defined(CONFIG_POST)
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed(void)
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
 {
-       return 0;       /* No hotkeys supported */
+       int rc = 0;
+#ifdef CONFIG_CS8900
+       rc = cs8900_initialize(0, CONFIG_CS8900_BASE);
+#endif
+       return rc;
 }
-#endif /* CONFIG_POST */
+#endif