Merge 'next' branch

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

diff --git a/board/ssv/adnpesc1/adnpesc1.c b/board/ssv/adnpesc1/adnpesc1.c
index 3ee8ba588dc20a8597c7642c2731ed024fa7e5ab..9d32741499ee7bf5997caa1a5cbb2a1acfa1d187 100644 (file)
--- a/board/ssv/adnpesc1/adnpesc1.c
+++ b/board/ssv/adnpesc1/adnpesc1.c
@@ -57,7 +57,7 @@ int checkboard (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return (0);
 }
@@ -76,14 +76,14 @@ 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) */
 }