Dear Alessandro Rubini: > Commit 5dca710a3d7703e41da0e9894f2d71f9e25bea6b removed > get_timer_masked for at91. The dataflash driver was still > using it and so stopped compiling. This blindly fixes > the compilation problem (I am not currently using dataflash). > > Signed-off-by: Alessandro Rubini <rub...@gnudd.com> > --- > drivers/spi/atmel_dataflash_spi.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/atmel_dataflash_spi.c > b/drivers/spi/atmel_dataflash_spi.c > index 4a5c4aa..d5215c0 100644 > --- a/drivers/spi/atmel_dataflash_spi.c > +++ b/drivers/spi/atmel_dataflash_spi.c > @@ -158,12 +158,12 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc) > } > > /* arm simple, non interrupt dependent timer */ > - reset_timer_masked(); > + reset_timer(); > timeout = 0; > > writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN, AT91_BASE_SPI + AT91_SPI_PTCR); > while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_RXBUFF) && > - ((timeout = get_timer_masked()) < CONFIG_SYS_SPI_WRITE_TOUT)); > + ((timeout = get_timer(0)) < CONFIG_SYS_SPI_WRITE_TOUT)); > writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + > AT91_SPI_PTCR); > pDesc->state = IDLE; > a) reset_timer(), and all *_masked() timer functions are depreciated and have been removed from AT91 timer code b) the problem has already been fixed in current u-boot-atmel/next
Best Regards, Reinhard _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
